blob: cfdfe3749d5d5c63a2b1b4b5d4f4576117f83bf7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
--- a/plugins/djvJpegPlugin/djvJpegLoad.cpp
+++ b/plugins/djvJpegPlugin/djvJpegLoad.cpp
@@ -215,14 +215,7 @@ bool jpegOpen(
libjpeg::jpeg_save_markers(jpeg, JPEG_COM, 0xFFFF);
- //! \todo How do we fix the windows/libjpeg TRUE name clash?
-
- libjpeg::boolean b =
-#if defined(DJV_WINDOWS)
- 1;
-#else
- libjpeg::TRUE;
-#endif // DJV_WINDOWS
+ libjpeg::boolean b = 1;
if (! libjpeg::jpeg_read_header(jpeg, b))
{
--- a/plugins/djvJpegPlugin/djvJpegSave.cpp
+++ b/plugins/djvJpegPlugin/djvJpegSave.cpp
@@ -242,14 +242,7 @@ bool jpegOpen(
libjpeg::jpeg_set_defaults(jpeg);
- //! \todo How do we fix the windows/libjpeg TRUE name clash?
-
- libjpeg::boolean b =
-#if defined(DJV_WINDOWS)
- 1;
-#else
- libjpeg::TRUE;
-#endif // DJV_WINDOWS
+ libjpeg::boolean b = 1;
libjpeg::jpeg_set_quality(jpeg, quality, b);
libjpeg::jpeg_start_compress(jpeg, b);
|