head 1.3; access; symbols pkgsrc-2021Q3:1.2.0.28 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.26 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.24 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.22 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.20 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.18 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.14 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.16 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.12 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.10 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.8 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.6 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.4 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.2 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.1.0.22 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.20 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.18 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.14 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.12 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.10 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.8 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.6 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.4 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.2 pkgsrc-2015Q4-base:1.1; locks; strict; comment @// @; 1.3 date 2021.09.28.09.59.24; author nia; state dead; branches; next 1.2; commitid j4Tbu3clMs4BRHaD; 1.2 date 2018.04.14.03.45.56; author markd; state Exp; branches; next 1.1; commitid 3ArmA02Otn14mmyA; 1.1 date 2015.10.05.04.37.39; author richard; state Exp; branches; next ; commitid jAQRDrVZ8vrKjSDy; desc @@ 1.3 log @libraw: Update to 0.20.2 2020-10-14 Alex Tutubalin * LibRaw 0.20.2 Reverted 0.20.1 change: - const buffer for open_buffer() and open_bayer() calls Because of 0.20.0 ABI break 2020-10-14 Alex Tutubalin * LibRaw 0.20.1 * Improvements: - exif callback is called on EXIF GPS and EXIF Interop IFDs - open_bayer call documented - Canon (ColorDatsSubver==32): parse Specular White instead of hardcoded value * Fixes for normal files processing: - Olympus XZ-1: do not provide linear_max (it is wrong in metadata) - Nikon Z cameras: added space in camera list - raw-identify: fixed wb-preset print - Pentax Optio 33WR: maker index was incorrect - dcraw_emu: corrected help line for -6 option. - raw-identify: corrected range check for color matrices print - use_camera_matrix option: fixed a bug introduced when making compiler more happy. * Fixes for damaged/special crafted files processing: - Fix for truncated CR3 files parsing - DNG metadata merger: all color loops are limited to MIN(4,colors) - Check for marings: should be less than raw image size - Check for xmpdata present in Samsung Lens ID assignment - Check for column range in leaf_hdr decoder - Additional checks in Hasselblad model parser - Fuji rotate: better limits check - DNG files: limit tiff_samples * Not fixes, but makes ASAN/compilers/etc happy: - corrected GPS EXIF output - const buffer for open_buffer() and open_bayer() calls 2020-07-23 Alex Tutubalin * LibRaw 0.20 == Camera Format support == Canon CR3 GoPro (via GPR SDK) Panasonic 14-bit Fujifilm compressed/16bit Rapsberry Pi RAW+JPEG format (if USE_6BY9RPI defined) Foveon X3F support changed: it is supported only if USE_X3FTOOLS defined at build (see below for 'Imported code policy changed') == Camera support (+59, 1131 total) == Canon: PowerShot G5 X Mark II, G7 X Mark III, SX70 HS, EOS R, EOS RP, EOS 90D, EOS 250D, EOS M6 Mark II, EOS M50, EOS M200 EOS 1DX Mark III (lossless files only) DJI Mavic Air, Osmo Action FujiFilm GFX 100, X-A7, X-Pro3, X100V, X-T4 (uncompressed/lossless compressed only), X-T200 GoPro Fusion, HERO5, HERO6, HERO7, HERO8 Hasselblad L1D-20c, X1D II 50C Leica D-LUX7, Q-P, Q2, V-LUX5, C-Lux / CAM-DC25, SL2, M10 Monochrom Nikon D780, Z50, P950 Olympus TG-6, E-M5 Mark III, E-PL10, E-M1 Mark III, Panasonic DC-FZ1000 II, DC-G90, DC-S1, DC-S1R, DC-S1H, DC-TZ95 PhaseOne IQ4 150MP Ricoh GR III Sony A7R IV, A9 II, ILCE-6100, ILCE-6600, RX0 II, RX100 VII Zenit M also multiple smartphones (the tested ones are listed in LibRaw::cameraList) == Source code re-arranged == * dcraw.c is not used in the generation and build processes * dcraw_common.cpp and libraw_cxx.cpp are split into multiple code chunks placed in separate subfolders (decoders/ for raw data decoders, metadata/ for metadata parsers, etc) * dcraw_common.cpp and libraw_cxx.cpp remain to preserve existing build environments (these files are now just a bunch of #include directives). * It is possible to build LibRaw a)without postprocessing functions (dcraw_process() and called function) b)without postprocessing and LibRaw::raw2image() call (and called function). It may be useful to reduce library memory/code footprint. See Makefile.devel.nopp and Makefile.devel.noppr2i for the list of source files needed to build reduced/stripped library. == Normalized make/model == There is a huge number of identical cameras sold under different names, depending on the market (e.g. multiple Panasonic or Canon models) and even some identical cameras sold under different brands (Panasonic -> Leica, Sony -> Hasselblad). To reduce clutter, a normalization mechanism has been implemented in LibRaw: In imgdata.idata: char normalized_make[64]; - primary vendor name (e.g. Panasonic for Leica re-branded cameras) char normalized_model[64]; - primary camera model name unsigned maker_index; - primary vendor name in indexed form (enum LibRaw_cameramaker_index, LIBRAW_CAMERAMAKER_* constant). These fields are always filled upon LibRaw::open_file()/open_buffer() calls. const char* LibRaw::cameramakeridx2maker(int index): converts maker_index to normalized_make. We recommend that you use these normalized names in a variety of data tables (color profiles, etc.) to reduce the number of duplicate entries. New vendor index values will be added strictly to the end of the LibRaw_cameramaker_index table, ensuring that the numbers assigned to vendors that are already known to LibRaw will not change. == DNG frame selection == DNG frames selection code re-worked: - by default all frames w/ the NewSubfileType tag equal to 0 (high-res image) are added to the list of available images (selection performed via imgdata.params.shot_select field, as usual) - the special case for Fuju SuperCCD (SamplesPerPixel == 2) works as before: shot_select=1 will extract second sub-image. - Additional flags to imgdata.params.raw_processing_options: LIBRAW_PROCESSING_DNG_ADD_ENHANCED - will add Enhanced DNG frame (NewSubfileType == 16) to the list of available frames LIBRAW_PROCESSING_DNG_ADD_PREVIEWS - will add previews (NewSubfileType == 1) to the list. - By default, DNG frames are not reordered and are available in same order as in DNG (LibRaw traverses IFD/Sub-IFD trees in deep-first order). To prioritize the largest image, set LIBRAW_PROCESSING_DNG_PREFER_LARGEST_IMAGE bit in imgdata.params.raw_processing_options. - DNG Stage2/Stage3 processing via DNG SDK (request via flags in raw_processing_options) == Imported code policy disclaimer == We've changed the policy regarding 3rd party code imported into LibRaw. We (like other authors of open-source RAW parsers) gladly import support code for various RAW formats from other projects (if the license allows it). This is done to expand camera support. Unfortunately, not all imported code can tolerate truncated or otherwise damaged raw files, as well as arbitrary conditions or arbitrary data; not all authors handle rejecting unexpected input well. LibRaw is now widely used in various projects, including ImageMagick, which, in turn, is often used on web sites to process any input images, including arbitrary data from unknown users. This opens up wide possibilities for exploiting the various vulnerabilities present in the code borrowed from other projects into LibRaw. In order to avoid such security risks, - the borrowed code will no longer compile by default. We are not able to support it in general case, and the authors refuse to add code to reject unexpected input. Thus, if you use some kind of camera for which the support is disabled by default, you need to recompile LibRaw for your specific case. Formats currently affected: X3F (Foveon) file format. Code is imported from Kalpanika X3F tools: https://github.com/Kalpanika/x3f To turn the support on, define USE_X3FTOOLS Rapsberry Pi RAW+JPEG format. Code is imported from https://github.com/6by9/dcraw/, To turn the support on, define USE_6BY9RPI Format support is indicated via LibRaw::capabilities() call with flags: LIBRAW_CAPS_X3FTOOLS - Foveon support LIBRAW_CAPS_RPI6BY9 - RPi RAW+JPEG support == GoPro .gpr format support == GoPro format supported via open-source GPR SDK See README.GoPro.txt for details. == Windows support/Windows unicode (wchar_t*) filenames support == * (old) LibRaw's WIN32 external define split into 3 defines to fine tune compiler/api compatibility: LIBRAW_WIN32_DLLDEFS - use to compile DLLs (__dllimport/__dllexport attributes) LIBRAW_WIN32_UNICODEPATHS - indicates that runtime has calls/datatypes for wchar_t filenames LIBRAW_WIN32_CALLS - use Win32 calls where appropriative (binary mode for files, LibRaw_windows_datastream, _snprintf instead of snprintf, etc). If the (old) WIN32 macro is defined at compile time, all three new defines are defined in libraw.h If not, these defines are defined based on compiler version/libc++ defines * LibRaw::open_file(wchar_t*) is always compiled in under Windows, but if LIBRAW_WIN32_UNICODEPATHS (see above) is not defined, this call will return LIBRAW_NOT_IMPLEMENTED. Use (LibRaw::capabilities() & LIBRAW_CAPS_UNICODEPATHS) on runtime to check that this call was really implemented (or check for #ifdef LIBRAW_WIN32_UNICODEPATHS after #include ) == LibRaw*datastream simplified == * tempbuffer_open, subfile_open are not used, so removed from LibRaw_abstract_datastream and derived classes. * jpeg_src() call implemented using ->read() call and own buffering (16k buffer). * buffering_off() call added. It should be used in derived classes to switch from buffered reads to unbuffered. == minor/unsorted changes == * new flag LIBRAW_WARN_DNGSDK_PROCESSED to indicate decoder used * LibRaw::open() call, max_buf_size special meaning: == 1 => open using bigfile_datastream == 2 => open using file_datastream * Add support for zlib during configure * Fixed multiple problems found by OSS-Fuzz * Lots of changes in imgdata.makernotes (hope someone will document it) * DNG SDK could be used (if enabled) to unpack multi-image DNG files. * DNG whitelevel calculated via BitsPerSample if not set via tags. * DNG: support for LinearDNG w/ BlackLevelRepeat.. pattern * Generic Arri camera format replaced w/ list of specific camera models in supported cameras list. * new samples/rawtextdump sample: allows one to dump (small selection) of RAW data in text format. * samples/raw-identify: * +M/-M params (same as in dcraw_emu) * -L parameter to get file list from a file * -m paramerer to use mmap'ed IO. * -t parameter for timing * samples/dcraw_emu: fixed +M handling * better support for Nikon Coolscan 16-bit NEF files. * Visual Studio project files: re-generated to .vcxproj (Visual Studio 2019), different intermediate folders for different sub-projects to allow 1-step rebuild. * imgdata.makernotes...cameraspecific: removed the vendor name prefix from variables. * Bayer images: ensure that even margins have the same COLOR() for both the active sensor area and the full sensor area. * raw processing flag bit LIBRAW_PROCESSING_CHECK_DNG_ILLUMINANT inverted and renamed to LIBRAW_PROCESSING_DONT_CHECK_DNG_ILLUMINANT. If not set, DNG illuminant will be checked. * New libraw_decoder_t flags: LIBRAW_DECODER_FLATDATA - in-file data could be used as is (if byte order matches), e.g. via mmap() LIBRAW_DECODER_FLAT_BG2_SWAPPED - special flag for Sony ARQ: indicates R-G-G2-B channel order in 4-color data * Camera-recorded image crop data is parsed into imgdata.sizes.raw_inset_crop structure: ctop,cleft,cwidth,cheight - crop size. aspect - LibRawImageAspects enum (3to2, 4to3, etc) * New define LIBRAW_NO_WINSOCK2 to not include winsock2.h on compile * New processing flag LIBRAW_PROCESSING_PROVIDE_NONSTANDARD_WB If set (default is not), and when applicable, color.cam_mul[] and color.WB_Coeffs/WBCT_Coeffs will contain WB settings for a non-standard workflow. Right now only Sony DSC-F828 is affected: camera-recorded white balance can't be directly applied to raw data because WB is for RGB, while raw data is RGBE. * New processing flag: LIBRAW_PROCESSING_CAMERAWB_FALLBACK_TO_DAYLIGHT If set (default is not), LibRaw::dcraw_process() will fallback to daylight WB (excluding some very specific cases like Canon D30). This is how LibRaw 0.19 (and older) works. If not set: LibRaw::dcraw_process() will fallback to calculated auto WB if camera WB is requested, but appropriate white balance was not found in metadata. * Google changes cherry-picked (thanks to Jamie Pinheiro) * speedup: ppg interpolate: const loop invariant * Bugs fixed -Fixed several UBs found by OSS Fuzz -Fixed several problems found by other fuzzers. - Thumbnail size range check (CVE-2020-15503) Thanks to Jennifer Gehrke of Recurity Labs GmbH for problem report. - fixed possible overflows in canon and sigma makernotes parsers - fixed possible buffer overrun in crx (cr3) decoder - fixed memory leak in crx decoder (if compiled with LIBRAW_NO_CR3_MEMPOOL) - fixed possible overrun in Sony SRF and SR2 metadata parsers * Fixed typo in longitude (member of parsed GPS structure), update required for code that uses it. @ text @$NetBSD: patch-internal_libraw__x3f.cpp,v 1.2 2018/04/14 03:45:56 markd Exp $ undefine DS if sys/regset.h is pulled in on SunOS --- internal/libraw_x3f.cpp.orig 2018-02-24 09:47:43.000000000 +0000 +++ internal/libraw_x3f.cpp @@@@ -710,6 +710,9 @@@@ static x3f_huffman_t *new_huffman(x3f_hu /* --------------------------------------------------------------------- */ /* Creating a new x3f structure from file */ /* --------------------------------------------------------------------- */ +#ifdef DS +#undef DS +#endif /* extern */ x3f_t *x3f_new_from_file(LibRaw_abstract_datastream *infile) { @ 1.2 log @libraw: update to 0.18.8 2018-02-23 Alex Tutubalin Secunia #81000: Credit: Laurent Delosieres, Secunia Research at Flexera * leaf_hdr_load_raw: check for image pointer for demosaiced raw * NOKIARAW parser: check image dimensions readed from file * quicktake_100_load_raw: check width/height limits * LibRaw 0.18.8 2018-01-29 Alex Tutubalin * Checks for width+left_margin/height+top_margin not larger than 64k * LIBRAW_MAX_ALLOC_MB define limits maximum image/raw_image allocation (default is 2048 so 2Gb per array) * LibRaw::read_shorts item count is now unsigned 2018-01-19 Alex Tutubalin Secunia #79000: Credit: Laurent Delosieres, Secunia Research at Flexera * All legacy (RGB raw) image loaders checks for imgdata.image is not NULL * kodak_radc_load_raw: check image size before processing * legacy memory allocator: allocate max(widh,raw_width)*max(height,raw_height) * LibRaw 0.18.7 2017-12-06 Alex Tutubalin Secunia #76000: * Fixed fuji_width handling if file is neither fuji nor DNG * Fixed xtrans interpolate for broken xtrans pattern * Fixed panasonic decoder * LibRaw 0.18.6 2017-09-22 Alex Tutubalin * Fixed possible out of bound access in Kodak 6500 loader * LibRaw 0.18.5 2017-09-12 Alex Tutubalin * CVE-2017-14348: Fix for possible heap overrun in Canon makernotes parser Credit: Henri Salo from Nixu Corporation * LibRaw 0.18.4 2017-09-09 Alex Tutubalin * Fix for CVE-2017-13735 * CVE-2017-14265: Additional check for X-Trans CFA pattern data * LibRaw 0.18.3 2017-03-08 Alex Tutubalin * Fixed several errors (Secunia advisory SA75000) * ACES colorspace output option included in dcraw_emu help page * Avoided possible 32-bit overflows in Sony metadata parser * Phase One flat field code called even for half-s * LibRaw 0.18.2 2017-02-12 Alex Tutubalin * Camera Support: Sigma Quatto H * Fixed bug in FujiExpoMidPointShift parser * Fixed wrong black level in Sony A350 * Added standard integer types for VisualStudio 2008 and earlier * LibRaw 0.18.1 2016-12-27 Alex Tutubalin * Licensing changes: - there is no 'LibRaw Software License 27032010' licensing anymore (and all signed agreements have expired) - LibRaw is now dual-licensed: LGPL 2.1 or CDDL 1.0 * Camera support (+87): Apple: iPad Pro, iPhone SE, iPhone 6s, iPhone 6 plus, iPhone 7, iPhone 7 plus BlackMagic Micro Cinema Camera, URSA, URSA Mini Canon PowerShot G5 X, PowerShot G7 X Mark II, PowerShot G9 X, IXUS 160 (CHDK hack), EOS 5D Mark IV, EOS 80D, EOS 1300D, EOS M10, EOS M5, EOS-1D X Mark II Casio EX-ZR4000/5000 DXO One, FujiFilm X-Pro2, X70, X-E2S, X-T2 Gione E7 GITUP GIT2 Google Pixel,Pixel XL Hasselblad X1D, True Zoom HTC MyTouch 4G, One (A9), One (M9), 10 Huawei P9 Leica M (Typ 262), M-D (Typ 262), S (Typ 007), SL (Typ 601), X-U (Typ 113), TL LG G3, G4 Meizy MX4 Nikon D5, D500, D3400 Olympus E-PL8, E-M10 Mark II, Pen F, SH-3, E-M1-II Panasonic DMC-G8/80/81/85, DMC-GX80/85, DMC-TZ80/81/85/ZS60, DMC-TZ100/101/ZS100,DMC-LX9/10/15, FZ2000/FZ2500 Pentax K-1, K-3 II, K-70 PhaseOne IQ3 100MP RaspberryPi Camera, Camera V2 Ricoh GR II Samsung Galaxy S7, S7 Edge Sigma sd Quattro Sony A7S II, ILCA-68 (A68),ILCE-6300,DSC-RX1R II,DSC-RX10III, DSC-RX100V, ILCA-99M2 (A99-II), a6500 IMX214, IMX219, IMX230, IMX298-mipi 16mp, IMX219-mipi 8mp, Xperia L PtGrey GRAS-50S5C YUNEEC CGO4 Xiaomi MI3, RedMi Note3 Pro * Floating point DNG support: - new data fields: imgdata.rawdata.float_image - bayer float data imgdata.rawdata.float3_image - 3-component float data imgdata.rawdata.float4_image - 4-component float data imgdata.color.fmaximum - float data maximum (calculated from real data, rounded to 1.0 if below 1.0) - new raw processing flag LIBRAW_PROCESSING_CONVERTFLOAT_TO_INT - converts float data to 16-bit integer immediately after decoding with default parameters - new API Calls: int LibRaw::is_floating_point() returns non-zero if RAW file contains floating point data int LibRaw::have_fpdata() returns non-zero if rawdata.float*_image is not null LibRaw::convertFloatToInt(float dmin=4096.f, float dmax=32767.f, float dtarget = 16383.f) converts float/float3/float4_image to raw_image/color3/color4_image with or without scaling: * New API calls unsigned LibRaw::capabilities and C-API libraw_capabilities() allows developers to determine LibRaw compile flags at runtime. Returns ORed bit fields: LIBRAW_CAPS_RAWSPEED - LibRaw was compiled with RawSpeed Support LIBRAW_CAPS_DNGSDK - LibRaw was compiled with Adobe DNG SDK LIBRAW_CAPS_DEMOSAICSGPL2, LIBRAW_CAPS_DEMOSAICSGPL3 - LibRaw was compiled with demosaic packs (GPL2/GPL3) * More metadata parsed: - White balance coefficients stored in the raw file are extracted into: int imgdata.color.WBCoeffs[256][4] - array indexed by EXIF lightsource type for example, WBCoeffs[21][..] contains coefficients for D65 lightsource float imgdata.color.WBCT_Coeffs[64][5] contains white balance data specified for given color temperature: WBCT_Coeffs[i][0] contains temperature value, and [1]..[4] are WB coefficients. - DNG analog balance, per-channel black/white level, and forward matrix - vendor specific metadata stored in vendor-specific data structures * new C-API calls: void libraw_set_user_mul(libraw_data_t *lr,int index, float val); void libraw_set_ca_correction(libraw_data_t *lr,int ca_correc, float ca_red, float ca_blue); void libraw_set_cfalinenoise(libraw_data_t *lr,int cfaline, float linenoise); void libraw_set_wf_debanding(libraw_data_t *lr, int wf_debanding, float wfd0, float wfd1, float wfd2, float wfd3); void libraw_set_interpolation_passes(libraw_data_t *lr,int passes); @ text @d1 1 a1 1 $NetBSD: patch-internal_libraw__x3f.cpp,v 1.1 2015/10/05 04:37:39 richard Exp $ @ 1.1 log @patches to undefine DS if sys/regset.h is pulled in on SunOS @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- internal/libraw_x3f.cpp.orig 2015-05-16 12:32:15.000000000 +0000 d7 1 a7 1 @@@@ -619,7 +619,9 @@@@ static x3f_huffman_t *new_huffman(x3f_hu a10 1 - d14 1 a16 1 x3f_t *x3f = (x3f_t *)calloc(1, sizeof(x3f_t)); @