wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1235297 - Annotate intentional switch fallthroughs to suppress -Wimplicit-fallthrough warnings in image/decoders/. r=tn

Browse Source 
image/FrameAnimator.cpp:442:5: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
image/FrameAnimator.cpp:576:7: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]

image/decoders/nsGIFDecoder2.cpp:1110:5 [-Wimplicit-fallthrough] unannotated fall-through between switch labels

image/decoders/nsJPEGDecoder.cpp:418:3 [-Wimplicit-fallthrough] unannotated fall-through between switch labels
image/decoders/nsJPEGDecoder.cpp:444:3 [-Wimplicit-fallthrough] unannotated fall-through between switch labels
image/decoders/nsJPEGDecoder.cpp:465:3 [-Wimplicit-fallthrough] unannotated fall-through between switch labels
image/decoders/nsJPEGDecoder.cpp:537:3 [-Wimplicit-fallthrough] unannotated fall-through between switch labels
This commit is contained in:
Chris Peterson 2015-12-24 23:50:32 -07:00
parent b23c7e4699
commit 346a4bf91c
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
image/FrameAnimator.cpp
View File

@ -439,7 +439,7 @@ FrameAnimator::DoBlend(nsIntRect* aDirtyRect,
// Calculate area that needs updating
switch (prevFrameData.mDisposalMethod) {
default:
MOZ_ASSERT_UNREACHABLE("Unexpected DisposalMethod");
MOZ_FALLTHROUGH_ASSERT("Unexpected DisposalMethod");
case DisposalMethod::NOT_SPECIFIED:
case DisposalMethod::KEEP:
*aDirtyRect = nextFrameData.mRect;
@ -573,7 +573,7 @@ FrameAnimator::DoBlend(nsIntRect* aDirtyRect,
break;
default:
MOZ_ASSERT_UNREACHABLE("Unexpected DisposalMethod");
MOZ_FALLTHROUGH_ASSERT("Unexpected DisposalMethod");
case DisposalMethod::NOT_SPECIFIED:
case DisposalMethod::KEEP:
// Copy previous frame into compositingFrame before we put the new

3
image/decoders/nsGIFDecoder2.cpp
View File

@ -1145,8 +1145,7 @@ nsGIFDecoder2::WriteInternal(const char* aBuffer, uint32_t aCount)
mGIFStruct.state = gif_error;
return;
}
// FALL THROUGH
MOZ_FALLTHROUGH; // to continue decoding header.
}
case gif_image_header_continue: {

4
image/decoders/nsJPEGDecoder.cpp
View File

@ -397,6 +397,7 @@ nsJPEGDecoder::WriteInternal(const char* aBuffer, uint32_t aCount)
mInfo.output_width, mInfo.output_height));
mState = JPEG_START_DECOMPRESS;
MOZ_FALLTHROUGH; // to start decompressing.
}
case JPEG_START_DECOMPRESS: {
@ -423,6 +424,7 @@ nsJPEGDecoder::WriteInternal(const char* aBuffer, uint32_t aCount)
// If this is a progressive JPEG ...
mState = mInfo.buffered_image ?
JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
MOZ_FALLTHROUGH; // to decompress sequential JPEG.
}
case JPEG_DECOMPRESS_SEQUENTIAL: {
@ -444,6 +446,7 @@ nsJPEGDecoder::WriteInternal(const char* aBuffer, uint32_t aCount)
"We didn't process all of the data!");
mState = JPEG_DONE;
}
MOZ_FALLTHROUGH; // to decompress progressive JPEG.
}
case JPEG_DECOMPRESS_PROGRESSIVE: {
@ -516,6 +519,7 @@ nsJPEGDecoder::WriteInternal(const char* aBuffer, uint32_t aCount)
mState = JPEG_DONE;
}
MOZ_FALLTHROUGH; // to finish decompressing.
}
case JPEG_DONE: {