Skip to content

Commit 04033ec

Browse files
committed
Incorporate changes to jpglib/jinclude.h from upstream JUCE to address a compiler warning
1 parent 69f185a commit 04033ec

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

  • JuceLibraryCode/modules/juce_graphics/image_formats/jpglib

JuceLibraryCode/modules/juce_graphics/image_formats/jpglib/jinclude.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
180180
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
181181
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
182182

183+
#define SHIFTED_BITS_PLUS_ONE(n) (int) (((unsigned int) -1) << n) + 1
184+
183185
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
184-
{ 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
185-
((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
186-
((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
187-
((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
186+
{ 0,
187+
SHIFTED_BITS_PLUS_ONE (1), SHIFTED_BITS_PLUS_ONE (2), SHIFTED_BITS_PLUS_ONE (3), SHIFTED_BITS_PLUS_ONE (4),
188+
SHIFTED_BITS_PLUS_ONE (5), SHIFTED_BITS_PLUS_ONE (6), SHIFTED_BITS_PLUS_ONE (7), SHIFTED_BITS_PLUS_ONE (8),
189+
SHIFTED_BITS_PLUS_ONE (9), SHIFTED_BITS_PLUS_ONE (10), SHIFTED_BITS_PLUS_ONE (11), SHIFTED_BITS_PLUS_ONE (12),
190+
SHIFTED_BITS_PLUS_ONE (13), SHIFTED_BITS_PLUS_ONE (14), SHIFTED_BITS_PLUS_ONE (15) };
191+
192+
#undef SHIFTED_BITS_PLUS_ONE
188193

189194
#endif /* AVOID_TABLES */
190195

0 commit comments

Comments
 (0)