Importing darktable_2.6.0.orig.tar.xz

1 files changed, 8 insertions, 11 deletions

diff --git a/src/external/rawspeed/src/librawspeed/decompressors/AbstractLJpegDecompressor.h b/src/external/rawspeed/src/librawspeed/decompressors/AbstractLJpegDecompressor.h
index 74a7941af..53a6d8d46 100644
--- a/src/external/rawspeed/src/librawspeed/decompressors/AbstractLJpegDecompressor.h
+++ b/src/external/rawspeed/src/librawspeed/decompressors/AbstractLJpegDecompressor.h
@@ -26,13 +26,10 @@
 #include "decoders/RawDecoderException.h"       // for ThrowRDE
 #include "decompressors/AbstractDecompressor.h" // for AbstractDecompressor
 #include "decompressors/HuffmanTable.h"         // for HuffmanTable
-#include "io/Buffer.h"                          // for Buffer, Buffer::size_type
 #include "io/ByteStream.h"                      // for ByteStream
-#include "io/Endianness.h" // for getHostEndianness, Endiannes...
-#include <array>           // for array
-#include <memory>          // for unique_ptr
-#include <utility>         // for move
-#include <vector>          // for vector
+#include <array>                                // for array
+#include <memory>                               // for unique_ptr
+#include <vector>                               // for vector
 
 /*
  * The following enum and two structs are stolen from the IJG JPEG library
@@ -118,20 +115,20 @@ struct JpegComponentInfo {
   * These values are fixed over the whole image.
   * They are read from the SOF marker.
   */
-  uint32 componentId = -1;		/* identifier for this component (0..255) */
+  uint32 componentId = ~0U; /* identifier for this component (0..255) */
 
   /*
   * Huffman table selector (0..3). The value may vary
   * between scans. It is read from the SOS marker.
   */
-  uint32 dcTblNo = -1;
-  uint32 superH = -1; // Horizontal Supersampling
-  uint32 superV = -1; // Vertical Supersampling
+  uint32 dcTblNo = ~0U;
+  uint32 superH = ~0U; // Horizontal Supersampling
+  uint32 superV = ~0U; // Vertical Supersampling
 };
 
 class SOFInfo {
 public:
-  JpegComponentInfo compInfo[4];
+  std::array<JpegComponentInfo, 4> compInfo;
   uint32 w = 0;    // Width
   uint32 h = 0;    // Height
   uint32 cps = 0;  // Components