File cinepaint-0.25-oy_api_0_9.patch of Package cinepaint

Overview Repositories Revisions Requests Users Attributes Meta

File cinepaint-0.25-oy_api_0_9.patch of Package cinepaint (Revision 7fc252e202ee2d02906432ac665c4eca)

Currently displaying revision 7fc252e202ee2d02906432ac665c4eca , Show latest

diff --git a/app/cms.c b/app/cms.c
index 02a65b8..77bfab6 100644
--- a/app/cms.c
+++ b/app/cms.c
@@ -37,8 +37,9 @@
 #endif
 
 #ifdef HAVE_OY
-#include <oyranos.h>
 #include <oyranos_devices.h>
+#include <oyObject_s.h>
+#include <oyProfiles_s.h>
 #endif
 
 #include "config.h"
@@ -340,7 +341,7 @@ void* my_alloc_func( size_t size )
 
 #ifdef HAVE_OY
 # if OYRANOS_VERSION > 107
-int iccMessageFunc( int code, const oyStruct_s * context, const char * format, ... )
+int iccMessageFunc( int code, const oyPointer context, const char * format, ... )
 {
   char* text = 0, *pos = 0;
   va_list list;
@@ -351,10 +352,10 @@ int iccMessageFunc( int code, const oyStruct_s * context, const char * format, .
     return 0;
 
 
-  if(context && oyOBJECT_NONE < context->type_)
+  if(context && oyOBJECT_NONE < ((oyStruct_s*)context)->type_)
   {
-    type_name = oyStruct_TypeToText( context );
-    id = oyObject_GetId( context->oy_ );
+    type_name = oyStruct_TypeToText( (oyStruct_s*)context );
+    id = oyObject_GetId( ((oyStruct_s*)context)->oy_ );
   }
 
   text = (char*)calloc(sizeof(char), 4096);
diff --git a/plug-ins/lraw/lraw.c b/plug-ins/lraw/lraw.c
index 57b9ae5..a914ff0 100644
--- a/plug-ins/lraw/lraw.c
+++ b/plug-ins/lraw/lraw.c
@@ -17,8 +17,8 @@
  */
 
 #include <oyranos.h>
-#include <alpha/oyranos_alpha.h>
-#include <alpha/oyranos_cmm.h>   /* for hacking into module API */
+#include <oyranos_devices.h>
+#include <oyConversion_s.h>
 
 /** Function oyConversion_FromImageFileName
  *  @brief   generate a Oyranos graph from a image file name
@@ -256,9 +256,9 @@ static gint32 load_image (gchar *filename)
     return -1;
   }
 
-  w = oy_image->width;
-  h = oy_image->height;
-  if(oyToDataType_m(oyImage_GetPixelLayout(oy_image)) == oyUINT16)
+  w = oyImage_GetWidth( oy_image );
+  h = oyImage_GetHeight( oy_image );
+  if(oyToDataType_m(oyImage_GetPixelLayout(oy_image,oyLAYOUT)) == oyUINT16)
   {
     image_type = U16_RGB;
     layer_type = U16_RGB_IMAGE;
@@ -290,7 +290,7 @@ static gint32 load_image (gchar *filename)
     int is_allocated = 0;
     y = 0;
     gimp_progress_update( .7 );
-    pixel = (guchar*)oy_image->getLine( oy_image, y, &ny,
+    pixel = (guchar*)oyImage_GetLineF(oy_image)( oy_image, y, &ny,
                                         -1, &is_allocated );
 
     /* this is a hack, but should work prefectly as long as lraw is used. */

Places

File cinepaint-0.25-oy_api_0_9.patch of Package cinepaint (Revision 7fc252e202ee2d02906432ac665c4eca)

Places