Use C-style comments
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1127 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
@@ -78,7 +78,7 @@ int main(void)
|
|||||||
jerr.pub.output_message = my_output_message;
|
jerr.pub.output_message = my_output_message;
|
||||||
|
|
||||||
if(setjmp(jerr.jb)) {
|
if(setjmp(jerr.jb)) {
|
||||||
// this will execute if libjpeg has an error
|
/* this will execute if libjpeg has an error */
|
||||||
jcs_valid = 0;
|
jcs_valid = 0;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
@@ -105,7 +105,7 @@ int main(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(setjmp(jerr.jb)) {
|
if(setjmp(jerr.jb)) {
|
||||||
// this will execute if libjpeg has an error
|
/* this will execute if libjpeg has an error */
|
||||||
jcs_alpha_valid = 0;
|
jcs_alpha_valid = 0;
|
||||||
goto done2;
|
goto done2;
|
||||||
}
|
}
|
||||||
|
|||||||
12
turbojpeg.c
12
turbojpeg.c
@@ -519,9 +519,9 @@ DLLEXPORT unsigned long DLLCALL tjBufSize(int width, int height,
|
|||||||
if(width<1 || height<1 || jpegSubsamp<0 || jpegSubsamp>=NUMSUBOPT)
|
if(width<1 || height<1 || jpegSubsamp<0 || jpegSubsamp>=NUMSUBOPT)
|
||||||
_throw("tjBufSize(): Invalid argument");
|
_throw("tjBufSize(): Invalid argument");
|
||||||
|
|
||||||
// This allows for rare corner cases in which a JPEG image can actually be
|
/* 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
|
larger than the uncompressed input (we wouldn't mention it if it hadn't
|
||||||
// happened before.)
|
happened before.) */
|
||||||
mcuw=tjMCUWidth[jpegSubsamp];
|
mcuw=tjMCUWidth[jpegSubsamp];
|
||||||
mcuh=tjMCUHeight[jpegSubsamp];
|
mcuh=tjMCUHeight[jpegSubsamp];
|
||||||
chromasf=jpegSubsamp==TJSAMP_GRAY? 0: 4*64/(mcuw*mcuh);
|
chromasf=jpegSubsamp==TJSAMP_GRAY? 0: 4*64/(mcuw*mcuh);
|
||||||
@@ -538,9 +538,9 @@ DLLEXPORT unsigned long DLLCALL TJBUFSIZE(int width, int height)
|
|||||||
if(width<1 || height<1)
|
if(width<1 || height<1)
|
||||||
_throw("TJBUFSIZE(): Invalid argument");
|
_throw("TJBUFSIZE(): Invalid argument");
|
||||||
|
|
||||||
// This allows for rare corner cases in which a JPEG image can actually be
|
/* 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
|
larger than the uncompressed input (we wouldn't mention it if it hadn't
|
||||||
// happened before.)
|
happened before.) */
|
||||||
retval=PAD(width, 16) * PAD(height, 16) * 6 + 2048;
|
retval=PAD(width, 16) * PAD(height, 16) * 6 + 2048;
|
||||||
|
|
||||||
bailout:
|
bailout:
|
||||||
|
|||||||
Reference in New Issue
Block a user