Squashed 'rtengine/libraw/' changes from 1ef70158d..12b0e5d60
12b0e5d60 Snapshot 202403 a4c9b1981 loop parameters in remove_trailing_spaces e231b01a4 CR3-Qstep table: avoid wrong 64-bit code generation 21368133a 0.21.2 release a6f212a4a tag type => tag size mapping fixed 41506ef73 cubic_spline: better handling of non-integer data 17294b5fd extra metadata check in arq_load_raw 47d9dd8e2 Better incorrect data handling in cubic_spline 3baa51068 skip invalid pattern in xtrans_interpolate eaf63bf5f Check HL recovery coeffs before processing a14574080 limit wavelet denoise minimum size 4e597e4e9 Merge pull request #594 from pinotree/path_max 086dcb9a6 raw-identify: use fallback if PATH_MAX not available 0e105f9f8 additional check against corrupted ljpeg layout 0c8b68e9f Disable color conversion for Canon 16-bit thumbnails cd1abd695 docs/changelog: explained the case when no thumbnail is found in specific file 6fffd414b rename swapXX to libraw_swapXX to avoid name conflict af78ae48a Check against corrupted LJPEG header in Canon sRAW decoder ba780e600 Limit embedded color profile allocation/read size 122bf7c5b Wrong alloc result check for 16-bit bitmap thumbnail e6dd2709e check pana_data/buffer offset before use ae2dc5884 Check P1 quadrant linearization coeff[15] against zero f2998bacc avoid integer overflow in buffer space check 443b7fb51 prevent buffer overrun in buffer_datastream::scanf_one 35a6d3615 ensure correct T.tlength for 16b bitmap thumbnails(2) b69ea8be5 ensure correct T.tlength for 16b bitmap thumbnails 2b6eca897 Do not run sraw decoder on (crafted) bayer files 68808b57f better striped thumbnails handling 9ab70f6dc do not set shrink flag for 3/4 component images 32425dd96 allow more decoders for fuji-rotated RAWs REVERT: 1ef70158d 0.21.2 release REVERT: 62f042366 tag type => tag size mapping fixed REVERT: ee087e3fe cubic_spline: better handling of non-integer data REVERT: af755b991 extra metadata check in arq_load_raw REVERT: 0fadd8819 Better incorrect data handling in cubic_spline REVERT: d7fb66053 skip invalid pattern in xtrans_interpolate REVERT: d059ed280 Check HL recovery coeffs before processing REVERT: 104730519 limit wavelet denoise minimum size REVERT: cae09838e raw-identify: use fallback if PATH_MAX not available REVERT: d6c677608 additional check against corrupted ljpeg layout REVERT: 1001a6ac1 Disable color conversion for Canon 16-bit thumbnails REVERT: a5130b01b docs/changelog: explained the case when no thumbnail is found in specific file REVERT: 600c0c63d rename swapXX to libraw_swapXX to avoid name conflict REVERT: 299c8a11b Check against corrupted LJPEG header in Canon sRAW decoder REVERT: ec8671ad9 Limit embedded color profile allocation/read size REVERT: 5229d5942 Wrong alloc result check for 16-bit bitmap thumbnail REVERT: b278b775f check pana_data/buffer offset before use REVERT: 7f4b8d3af Check P1 quadrant linearization coeff[15] against zero REVERT: e942a7db6 avoid integer overflow in buffer space check REVERT: f6a57cfb8 prevent buffer overrun in buffer_datastream::scanf_one REVERT: 3e62ed304 ensure correct T.tlength for 16b bitmap thumbnails(2) REVERT: 8e52d81cd ensure correct T.tlength for 16b bitmap thumbnails REVERT: 8e1af15e2 Do not run sraw decoder on (crafted) bayer files REVERT: 0ace959c2 better striped thumbnails handling REVERT: 477e0719f do not set shrink flag for 3/4 component images REVERT: c8efae6c5 allow more decoders for fuji-rotated RAWs git-subtree-dir: rtengine/libraw git-subtree-split: 12b0e5d60c57bb795382fda8494fc45f683550b8
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* -*- C++ -*-
|
||||
* File: internal/libraw_cameraids.h
|
||||
* Copyright 2008-2021 LibRaw LLC (info@libraw.org)
|
||||
* Copyright 2008-2024 LibRaw LLC (info@libraw.org)
|
||||
* Created: Sat Aug 17, 2020
|
||||
|
||||
LibRaw is free software; you can redistribute it and/or modify
|
||||
@@ -91,6 +91,10 @@ it under the terms of the one of two licenses as you choose:
|
||||
#define CanonID_EOS_R7 (0x80000000ULL + 0x464ULL)
|
||||
#define CanonID_EOS_R10 (0x80000000ULL + 0x465ULL)
|
||||
#define CanonID_EOS_M50_Mark_II (0x80000000ULL + 0x468ULL)
|
||||
#define CanonID_EOS_R50 (0x80000000ULL + 0x480ULL)
|
||||
#define CanonID_EOS_R6m2 (0x80000000ULL + 0x481ULL)
|
||||
#define CanonID_EOS_R8 (0x80000000ULL + 0x487ULL)
|
||||
#define CanonID_EOS_R100 (0x80000000ULL + 0x498ULL)
|
||||
|
||||
// CanonID_EOS_D2000C after Canon's TIFF2CR2 convertor:
|
||||
#define CanonID_EOS_D2000C (0x80000000ULL + 0x520ULL)
|
||||
@@ -160,6 +164,7 @@ it under the terms of the one of two licenses as you choose:
|
||||
#define OlyID_E_M1_Mark_III OlyID_str2hex("S0092")
|
||||
#define OlyID_E_P7 OlyID_str2hex("S0093")
|
||||
#define OlyID_OM_1 OlyID_str2hex("S0095")
|
||||
#define OlyID_OM_5 OlyID_str2hex("S0101")
|
||||
#define OlyID_C_3030Z OlyID_str2hex("SX351")
|
||||
#define OlyID_C_5050Z OlyID_str2hex("SX558")
|
||||
#define OlyID_C_350Z OlyID_str2hex("SX751")
|
||||
@@ -303,6 +308,7 @@ it under the terms of the one of two licenses as you choose:
|
||||
#define SonyID_DSC_RX100M5A 0x171ULL
|
||||
#define SonyID_ILCE_6400 0x173ULL
|
||||
#define SonyID_DSC_RX0M2 0x174ULL
|
||||
#define SonyID_DSC_HX95 0x175ULL
|
||||
#define SonyID_DSC_RX100M7 0x176ULL
|
||||
#define SonyID_ILCE_7RM4 0x177ULL
|
||||
#define SonyID_ILCE_9M2 0x178ULL
|
||||
@@ -317,4 +323,12 @@ it under the terms of the one of two licenses as you choose:
|
||||
#define SonyID_ILCE_7RM3A 0x182ULL
|
||||
#define SonyID_ILCE_7RM4A 0x183ULL
|
||||
#define SonyID_ILCE_7M4 0x184ULL
|
||||
// #define SonyID_ZV_1F 0x185ULL // Sony ZV-1F doesn't save raw
|
||||
#define SonyID_ILCE_7RM5 0x186ULL
|
||||
#define SonyID_ILME_FX30 0x187ULL
|
||||
#define SonyID_ZV_E1 0x189ULL
|
||||
#define SonyID_ILCE_6700 0x18aULL
|
||||
#define SonyID_ZV_1M2 0x18bULL
|
||||
#define SonyID_ILCE_7CR 0x18cULL
|
||||
#define SonyID_ILCE_7CM2 0x18dULL
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user