summaryrefslogtreecommitdiffstats
path: root/common/turbojpeg.c
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2012-09-11 22:50:11 +0300
committerChristian Beier <dontmind@freeshell.org>2012-09-14 18:47:17 +0200
commit3cbef1a976731bb3a714ee13cbd1813ed142ae5e (patch)
tree23304ece279ab76aacc8b1d4958ea02bfe7204d7 /common/turbojpeg.c
parent88e60435854e7f8edf085a5f4564c7e8cd847699 (diff)
downloadlibvncserver-3cbef1a976731bb3a714ee13cbd1813ed142ae5e.zip
libvncserver-3cbef1a976731bb3a714ee13cbd1813ed142ae5e.tar.gz
Use C-style comments in rfbconfig.h.cmake and C source code.
Using C++-style comments when building the code with -ansi does not work, so be more conservative with the comment style.
Diffstat (limited to 'common/turbojpeg.c')
-rw-r--r--common/turbojpeg.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/common/turbojpeg.c b/common/turbojpeg.c
index f7b9245..09df173 100644
--- a/common/turbojpeg.c
+++ b/common/turbojpeg.c
@@ -502,9 +502,11 @@ DLLEXPORT unsigned long DLLCALL tjBufSize(int width, int height,
if(width<1 || height<1 || jpegSubsamp<0 || jpegSubsamp>=NUMSUBOPT)
_throw("tjBufSize(): Invalid argument");
- // This allows for rare corner cases in which a JPEG image can actually be
- // larger than the uncompressed input (we wouldn't mention it if it hadn't
- // happened before.)
+ /*
+ * This allows for rare corner cases in which a JPEG image can actually be
+ * larger than the uncompressed input (we wouldn't mention it if it hadn't
+ * happened before.)
+ */
mcuw=tjMCUWidth[jpegSubsamp];
mcuh=tjMCUHeight[jpegSubsamp];
chromasf=jpegSubsamp==TJSAMP_GRAY? 0: 4*64/(mcuw*mcuh);
@@ -521,9 +523,11 @@ DLLEXPORT unsigned long DLLCALL TJBUFSIZE(int width, int height)
if(width<1 || height<1)
_throw("TJBUFSIZE(): Invalid argument");
- // This allows for rare corner cases in which a JPEG image can actually be
- // larger than the uncompressed input (we wouldn't mention it if it hadn't
- // happened before.)
+ /*
+ * This allows for rare corner cases in which a JPEG image can actually be
+ * larger than the uncompressed input (we wouldn't mention it if it hadn't
+ * happened before.)
+ */
retval=PAD(width, 16) * PAD(height, 16) * 6 + 2048;
bailout:
OpenPOWER on IntegriCloud