i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JPEG translator: fix warnings and enable Werror

Browse Source 
Using setjmp and modifying local variables in the same function is not
allowed.

Fixes #12653.
This commit is contained in:
Adrien Destugues
2016-07-10 19:17:01 +02:00
parent be2c072556
commit 863a6388b4
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/jpeg/JPEGTranslator.cpp
+2 -5
View File
@@ -764,10 +764,6 @@ JPEGTranslator::DerivedTranslate(BPositionIO* inSource,
const translator_info* inInfo, BMessage* ioExtension, uint32 outType, const translator_info* inInfo, BMessage* ioExtension, uint32 outType,
BPositionIO* outDestination, int32 baseType) BPositionIO* outDestination, int32 baseType)
{ {
// If no specific type was requested, convert to the interchange format
if (outType == 0)
outType = B_TRANSLATOR_BITMAP;
// Setup a "breakpoint" since throwing exceptions does not seem to work // Setup a "breakpoint" since throwing exceptions does not seem to work
// at all in an add-on. (?) // at all in an add-on. (?)
// In the be_jerror.cpp we implement a handler for critical library errors // In the be_jerror.cpp we implement a handler for critical library errors
@@ -788,7 +784,8 @@ JPEGTranslator::DerivedTranslate(BPositionIO* inSource,
&& outType == JPEG_FORMAT) { && outType == JPEG_FORMAT) {
return Compress(inSource, outDestination, &longJumpBuffer); return Compress(inSource, outDestination, &longJumpBuffer);
} else if (inInfo->type == JPEG_FORMAT } else if (inInfo->type == JPEG_FORMAT
&& outType == B_TRANSLATOR_BITMAP) { && (outType == B_TRANSLATOR_BITMAP || outType == 0)) {
// This is the default if no specific outType was requested.
return Decompress(inSource, outDestination, ioExtension, return Decompress(inSource, outDestination, ioExtension,
&longJumpBuffer); &longJumpBuffer);
} }