Attachment 243146 Details for Bug 272311 – graphics/oyranos: make compatible with exiv2 0.28

[patch] graphics/oyranos: make compatible with exiv2 0.28

0017-graphics-oyranos-make-compatible-with-exiv2-0.28.patch (text/plain), 4.35 KB, created by Matthias Andree on 2023-07-02 14:58:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-02 14:58:54 UTC

Size: 4.35 KB

patch

obsolete

>From a611b13e2c95c3d29f284bcfd34fd4535af73f2e Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sun, 2 Jul 2023 16:45:40 +0200
>Subject: [PATCH 17/20] graphics/oyranos: make compatible with exiv2 0.28
>
>PR:		272311
>---
> graphics/oyranos/Makefile                     |  2 +-
> ...lor_modules_devices_oyranos__cmm__oyRE.cpp | 77 ++++++++++++++++++-
> 2 files changed, 77 insertions(+), 2 deletions(-)
>
>diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
>index b165a7dce92d..e87232e965d6 100644
>--- a/graphics/oyranos/Makefile
>+++ b/graphics/oyranos/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	oyranos
> PORTVERSION=	0.9.6
>-PORTREVISION=	15
>+PORTREVISION=	16
> CATEGORIES=	graphics
> 
> MAINTAINER=	ports@FreeBSD.org
>diff --git a/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranos__cmm__oyRE.cpp b/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranos__cmm__oyRE.cpp
>index 4f5b51d8d688..9235db1f9df1 100644
>--- a/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranos__cmm__oyRE.cpp
>+++ b/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranos__cmm__oyRE.cpp
>@@ -4,6 +4,15 @@ https://gitlab.com/oyranos/oyranos/-/commit/7fd1eabdf9f59727c0f516d33663d895f812
> 
> --- src/modules/color/modules/devices/oyranos_cmm_oyRE.cpp.orig	2016-12-09 10:36:53 UTC
> +++ src/modules/color/modules/devices/oyranos_cmm_oyRE.cpp
>+@@ -140,7 +140,7 @@ static int _initialised = 0;
>+ extern oyCMMapi8_s_ _api8;
>+ 
>+ 
>+-bool is_raw( int id );
>++bool is_raw( Exiv2::ImageType id );
>+ int DeviceFromContext(oyConfig_s **config, libraw_output_params_t *params);
>+ int DeviceFromHandle_opt(oyConfig_s *device, oyOption_s *option);
>+ 
> @@ -482,7 +482,7 @@ oyProfile_s * createMatrixProfile      ( libraw_colord
>        oyOptions_s * result = 0;
>  
>@@ -13,7 +22,16 @@ https://gitlab.com/oyranos/oyranos/-/commit/7fd1eabdf9f59727c0f516d33663d895f812
>        oyOptions_Handle( reg, opts, "create_profile.icc_profile.color_matrix",
>                          &result );
>  
>-@@ -1447,7 +1447,7 @@ int DeviceFromContext(oyConfig_s **config, libraw_outp
>+@@ -558,7 +558,7 @@ class exif2options {
>+  *
>+  * \todo { Untested }
>+  */
>+-int DeviceFromHandle(oyOptions_s **options, Exiv2::Image::AutoPtr image)
>++int DeviceFromHandle(oyOptions_s **options, Exiv2::Image::UniquePtr image)
>+ {
>+    int error = 0;
>+ 
>+@@ -1447,14 +1447,14 @@ int DeviceFromContext(oyConfig_s **config, libraw_outp
>     DFC_OPT_ADD_INT_ARR(greybox,1) //4
>     DFC_OPT_ADD_INT_ARR(greybox,2) //4
>     DFC_OPT_ADD_INT_ARR(greybox,3) //4
>@@ -22,3 +40,60 @@ https://gitlab.com/oyranos/oyranos/-/commit/7fd1eabdf9f59727c0f516d33663d895f812
>  
>     return error;
>  }
>+ 
>+ int DeviceFromHandle_opt(oyConfig_s *device, oyOption_s *handle_opt)
>+ {
>+-   Exiv2::Image::AutoPtr device_handle;
>++   Exiv2::Image::UniquePtr device_handle;
>+    oyAlloc_f allocateFunc = malloc;
>+    if (handle_opt) {
>+       char * filename = NULL;
>+@@ -1484,7 +1484,7 @@ int DeviceFromHandle_opt(oyConfig_s *device, oyOption_
>+ 
>+       //The std::auto_ptr::get() method returns the pointer owned by the auto_ptr
>+       if (device_handle.get() && device_handle->good())
>+-         DeviceFromHandle(oyConfig_GetOptions(device,"backend_core"), device_handle);
>++         DeviceFromHandle(oyConfig_GetOptions(device,"backend_core"), std::move(device_handle));
>+       else {
>+          int level = oyMSG_WARN;
>+          if(filename && strcmp( filename, "dummy" ) == 0)
>+@@ -1502,23 +1502,23 @@ int DeviceFromHandle_opt(oyConfig_s *device, oyOption_
>+    return 0;
>+ }
>+ 
>+-bool is_raw( int id )
>++bool is_raw( Exiv2::ImageType id )
>+ {
>+-   //using namespace Exiv2::ImageType;
>++   // using namespace Exiv2::ImageType;
>+    switch (id) {
>+-      case 3: //crw:
>+-      case 4: //tiff
>+-      case 5: //mrw:
>+-      case 7: //cr2:
>+-      case 8: //raf:
>+-      case 9: //orf:
>+-      case 16: //rw2:
>+-         return true;
>+-         break;
>+-      default:
>+-         if(id == 0)
>+-           return false;
>+-         else
>+-           return true;
>++	   case Exiv2::ImageType::crw:
>++	   case Exiv2::ImageType::tiff:
>++	   case Exiv2::ImageType::mrw:
>++	   case Exiv2::ImageType::cr2:
>++	   case Exiv2::ImageType::raf:
>++	   case Exiv2::ImageType::orf:
>++	   case Exiv2::ImageType::rw2:
>++		   return true;
>++		   break;
>++	   default:
>++		   if(Exiv2::ImageType::none == id)
>++			   return false;
>++		   else
>++			   return true;
>+    }
>+ }
>-- 
>2.41.0
>

Flags:

mandree: maintainer-approval+

Actions: View | Diff

Attachments on bug 272311: 243098 | 243100 | 243103 | 243104 | 243106 | 243111 | 243124 | 243125 | 243135 | 243136 | 243137 | 243138 | 243139 | 243140 | 243141 | 243142 | 243143 | 243144 | 243145 | 243146 | 243147 | 243148 | 243154 | 243155 | 243156 | 243157 | 243158 | 243159 | 243160 | 243166 | 243167 | 243168 | 243169 | 243170 | 243171 | 243172 | 243175 | 243176