head 1.7; access; symbols pkgsrc-2018Q4:1.6.0.60 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.58 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.56 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.54 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.52 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.50 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.46 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.44 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.42 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.40 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.38 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.36 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.34 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.32 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.30 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.28 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.26 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.24 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.22 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.20 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.18 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.16 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.14 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.12 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.10 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.8 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.6 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.4 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.2 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.5.0.24 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.22 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.20 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.18 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.16 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.14 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.12 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.10 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.8 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.6 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.4 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.2 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.4.0.18 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.16 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.14 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.12 pkgsrc-2008Q1:1.4.0.10 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.8 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.6 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.4 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.2 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.4 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.2 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.1.0.4 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.2 pkgsrc-2005Q1-base:1.1; locks; strict; comment @# @; 1.7 date 2018.12.31.13.11.12; author ryoon; state dead; branches; next 1.6; commitid kXUswtBUru0q8X5B; 1.6 date 2011.11.23.23.30.30; author joerg; state Exp; branches; next 1.5; 1.5 date 2008.11.10.19.04.45; author adam; state Exp; branches; next 1.4; 1.4 date 2007.01.20.14.30.17; author joerg; state Exp; branches; next 1.3; 1.3 date 2006.01.31.21.06.56; author adam; state dead; branches; next 1.2; 1.2 date 2005.07.04.19.57.01; author drochner; state Exp; branches; next 1.1; 1.1 date 2005.03.16.18.32.50; author rillig; state Exp; branches; next ; desc @@ 1.7 log @Update to 1.0.4 * Use FreeBSD patches to fix build and startup crash Changelog: I could not find it. @ text @$NetBSD: patch-ad,v 1.6 2011/11/23 23:30:30 joerg Exp $ --- app/app_procs.c.orig 2007-01-16 08:43:41.000000000 +0000 +++ app/app_procs.c @@@@ -73,6 +73,7 @@@@ #include "brush.h" #include "layout.h" #include "minimize.h" +#include "store_frame_manager.h" #include "depth/displaylut.h" #include "config.h" @ 1.6 log @Fix build with newer GCC @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2008/11/10 19:04:45 adam Exp $ @ 1.5 log @Changes 0.22.1: * native OpenEXR Half sample type substitutes the older RnH 16-bit float * load/save multilayerd OpenEXR files like from Blender * load/save 16-bit Half Tiff's * precise drawing with tablet - thanks to Tino Schwarze for hardware * speedup in gamma-expose and Brightness/Contrast Adjustments * dynamic colour visualisation in ICC Examin plug-in * UTF-8 support through Gtk2 * UFRaw plug-in ready * CMS defaults to Oyranos * Tango icons for toolbox only * Retinex plug-in * Bugfixes @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- app/app_procs.c.orig 2007-01-16 09:43:41.000000000 +0100 @ 1.4 log @Fix build. Not sure why this was released. @ text @d3 1 a3 1 --- app/app_procs.c.orig 2007-01-20 14:09:54.000000000 +0000 a12 18 @@@@ -82,6 +83,8 @@@@ #define SHOW_LATER 1 #define SHOW_NOW 2 +static void app_update_prefix(void); + extern int start_with_sfm; extern int initial_frames_loaded; @@@@ -710,7 +713,7 @@@@ app_exit (int kill_it) */ } -void +static void app_update_prefix (void) { if(strcmp(GetDirStaticPrefix(), GetDirPrefix()) != 0) @ 1.3 log @Changed 0.20.2: Overall stability has improved. User interface is more clear regarding colourmanaging. Softproofing is introduced. The gutenprint plug-in uses the proofing profile as default separation target. OpenEXR <-> ICC colour space information conversation The expose item is moved from -->Color-->Expose Image to -->View-->Expose. It is now a per window setting and only available for 32-bit floats. Many bugs where fixed. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2005/07/04 19:57:01 drochner Exp $ d3 13 a15 45 --- app/cms.c.orig 2005-05-24 20:51:25.000000000 +0200 +++ app/cms.c @@@@ -208,7 +208,12 @@@@ erase_alpha_from_4th_color (CMSTransform * called from app_procs.c:app_init() */ void cms_init() -{ profile_cache = g_hash_table_new(g_str_hash, g_str_equal); +{ + GList *remove_settings = NULL; + GList *update_settings = NULL; + cmsHPROFILE test = NULL; + + profile_cache = g_hash_table_new(g_str_hash, g_str_equal); transform_cache = g_hash_table_new(g_str_hash, g_str_equal); profile_info_buffer = g_new(CMSProfileInfo, 1); profile_info_buffer->manufacturer = NULL; @@@@ -222,9 +227,6 @@@@ void cms_init() /* suppress lcms errors while checking */ cmsErrorAction(LCMS_ERROR_IGNORE); - GList *remove_settings = NULL; - GList *update_settings = NULL; - cmsHPROFILE test = NULL; /* 1. image profile */ if (cms_default_image_profile_name != NULL) @@@@ -525,11 +527,12 @@@@ cms_read_icc_profile_dir(gchar *path, ic while ((entry = readdir (dir))) { char *file_name = entry->d_name; cmsHPROFILE profile; + GString *file_path; if ((strcmp (file_name, "..") == 0) || (strcmp (file_name, ".") == 0)) { continue; } - GString *file_path = g_string_new(NULL); + file_path = g_string_new(NULL); g_string_sprintf (file_path, "%s/%s", path, file_name); /* Open the file and try to read it using the lcms library @@@@ -566,6 +569,7 @@@@ cms_read_standard_profile_dirs(icProfile const char *home = GetDirHome(); char *directories = g_strdup(cms_profile_path); GString *file_path = g_string_new(NULL); + GSList *sub_list; d17 1 a17 34 /* process path by path, paths are separated by : */ char *remaining_directories = directories; @@@@ -580,7 +584,7 @@@@ cms_read_standard_profile_dirs(icProfile { path = strdup(token); } - GSList *sub_list = cms_read_icc_profile_dir(path, class); + sub_list = cms_read_icc_profile_dir(path, class); return_list = g_slist_concat(return_list, sub_list); g_free(path); @@@@ -729,6 +733,7 @@@@ cms_load_profile_to_mem (char* filename, CMSProfile * cms_get_profile_from_file(char *file_name) { CMSProfile *return_value; + ProfileCacheEntry *cache_entry; size_t size_order = 128; char *mem = 0; const char *keyname = 0; @@@@ -743,7 +748,7 @@@@ cms_get_profile_from_file(char *file_nam keyname = cms_get_profile_keyname (profile, mem); /* check hash table for profile */ - ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, + cache_entry = g_hash_table_lookup(profile_cache, (gpointer) cms_get_profile_keyname(profile,mem)); if (cache_entry != NULL) { cache_entry->ref_count ++; @@@@ -783,7 +788,8 @@@@ cms_get_profile_from_file(char *file_nam CMSProfile * cms_get_profile_from_mem(void *mem_pointer, DWORD size) { CMSProfile *return_value; - + ProfileCacheEntry *cache_entry; d19 2 a20 255 /* get profile information */ cmsHPROFILE profile = cmsOpenProfileFromMem (mem_pointer, size); if (profile == NULL) @@@@ -792,7 +798,7 @@@@ cms_get_profile_from_mem(void *mem_point } /* check hash table for profile */ - ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, + cache_entry = g_hash_table_lookup(profile_cache, (gpointer) cms_get_profile_keyname(profile,mem_pointer)); if (cache_entry != NULL) { cache_entry->ref_count ++; @@@@ -852,6 +858,7 @@@@ cms_get_profile_data(CMSProfile *profile CMSProfile * cms_get_lab_profile(LPcmsCIExyY white_point) { CMSProfile *return_value; + ProfileCacheEntry *cache_entry; GString *hash_key = g_string_new(NULL); if (white_point) @@@@ -861,7 +868,7 @@@@ cms_get_lab_profile(LPcmsCIExyY white_po { g_string_sprintf(hash_key, "###LAB###"); } - ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, (gpointer) hash_key); + cache_entry = g_hash_table_lookup(profile_cache, (gpointer) hash_key); if (cache_entry != NULL) { cache_entry->ref_count ++; return_value = cache_entry->profile; @@@@ -1034,12 +1041,13 @@@@ cms_return_profile(CMSProfile *profile) { /* search the cache for the profile * decreate ref_counter + possibly close profile */ + ProfileCacheEntry *entry; if (profile == NULL) { g_warning("cms_return_profile: profile is NULL"); return FALSE; } - ProfileCacheEntry *entry = g_hash_table_lookup(profile_cache, (gpointer)profile->cache_key); + entry = g_hash_table_lookup(profile_cache, (gpointer)profile->cache_key); if (entry == NULL) { g_warning("cms_return_profile: profile not found in cache"); return FALSE; @@@@ -1072,7 +1080,18 @@@@ cms_get_transform(GSList *profiles, { /* turn profiles into an array as needed by lcms + check all profiles are registered with the profile cache + create hash key to check transform cache */ + + int i; + GString *hash_key; + CMSProfile *current_profile; + GSList *iterator; + TransformCacheEntry *cache_entry; + cmsHTRANSFORM transform; + cmsHPROFILE devicelink; + char *file_name; + int num_profiles = g_slist_length(profiles); + cmsHPROFILE profile_array[num_profiles]; if (num_profiles == 0) { g_warning("cms_get_transform: profile list is empty, cannot create transfrom"); return NULL; @@@@ -1092,12 +1111,9 @@@@ cms_get_transform(GSList *profiles, return NULL; } - cmsHPROFILE profile_array[num_profiles]; - GString *hash_key = g_string_new(NULL); + hash_key = g_string_new(NULL); - int i; - CMSProfile *current_profile; - GSList *iterator = profiles; + iterator = profiles; for (i=0; ((idata; if (g_hash_table_lookup(profile_cache, (gpointer)current_profile->cache_key) == NULL) @@@@ -1114,7 +1130,7 @@@@ cms_get_transform(GSList *profiles, lcms_intent, lcms_flags); /* now check the cache */ - TransformCacheEntry *cache_entry = g_hash_table_lookup(transform_cache, (gpointer) hash_key->str); + cache_entry = g_hash_table_lookup(transform_cache, (gpointer) hash_key->str); /* if it was in the disc cache */ if (cache_entry != NULL) @@@@ -1143,7 +1159,6 @@@@ cms_get_transform(GSList *profiles, } /* if no cache hit, create transform */ - cmsHTRANSFORM transform; transform = cmsCreateMultiprofileTransform (profile_array, num_profiles, lcms_input_format, @@@@ -1157,8 +1172,8 @@@@ cms_get_transform(GSList *profiles, } /* save it to disk */ - cmsHPROFILE devicelink = cmsTransform2DeviceLink(transform,0); - char *file_name = file_temp_name("icc"); + devicelink = cmsTransform2DeviceLink(transform,0); + file_name = file_temp_name("icc"); _cmsSaveProfile(devicelink, file_name); cmsCloseProfile(devicelink); @@@@ -1282,6 +1297,12 @@@@ cms_set_display_profile(CMSProfile *prof void cms_transform_area(CMSTransform *transform, PixelArea *src_area, PixelArea *dest_area) { TransformFunc transform_func; + PixelRow src_row_buffer, dest_row_buffer; + guint h; + void *src_data, *dest_data; + guint num_pixels; + void *pag; + Tag src_tag = pixelarea_tag(src_area); Tag dest_tag = pixelarea_tag(dest_area); if (tag_precision(src_tag) != tag_precision(dest_tag)) @@@@ -1309,12 +1330,6 @@@@ cms_transform_area(CMSTransform *transfo } - PixelRow src_row_buffer, dest_row_buffer; - guint h; - void *src_data, *dest_data; - guint num_pixels; - void *pag; - for (pag = pixelarea_register (1, src_area, dest_area); pag != NULL; pag = pixelarea_process (pag)) @@@@ -1385,6 +1400,8 @@@@ void cms_transform_float(CMSTransform *transform, void *src_data, void *dest_data, int num_pixels) { /* need to convert data to double for lcms's convenience */ int i; + float *src_fbuffer, *dest_fbuffer; + double *dbuffer; if (!transform || !transform->handle) g_warning ("%s:%d %s() transform not allocated\n", __FILE__,__LINE__,__func__); @@@@ -1392,9 +1409,9 @@@@ cms_transform_float(CMSTransform *transf g_warning ("%s:%d %s() array not allocated\n", __FILE__,__LINE__,__func__); - float *src_fbuffer = (float *)src_data; - float *dest_fbuffer = (float *)dest_data; - double *dbuffer = malloc(sizeof(double) * num_pixels * 4); + src_fbuffer = (float *)src_data; + dest_fbuffer = (float *)dest_data; + dbuffer = malloc(sizeof(double) * num_pixels * 4); for (i=0; i < num_pixels * 4; i++) { dbuffer[i]=(double)src_fbuffer[i]; } @@@@ -1463,10 +1480,14 @@@@ static GtkWidget *cms_profile_menu_new(G { GtkWidget *menu; GtkWidget *menuitem; GtkWidget *optionmenu; + + gchar *current_filename; + CMSProfile *current_profile; + CMSProfileInfo *current_profile_info; - menu = gtk_menu_new (); GSList *profile_file_names = cms_read_standard_profile_dirs(CMS_ANY_PROFILECLASS); GSList *iterator = profile_file_names; + menu = gtk_menu_new (); if (can_select_none) { menuitem = gtk_menu_item_new_with_label("[none]"); @@@@ -1474,9 +1495,6 @@@@ static GtkWidget *cms_profile_menu_new(G gtk_object_set_data(GTK_OBJECT(menuitem), "value", NULL); } - gchar *current_filename; - CMSProfile *current_profile; - CMSProfileInfo *current_profile_info; while (iterator != NULL) { current_filename = iterator->data; current_profile = cms_get_profile_from_file(current_filename); @@@@ -1506,8 +1524,8 @@@@ static GtkWidget *cms_intent_menu_new(Gt GtkWidget *menuitem = NULL; GtkWidget *optionmenu = NULL; - menu = gtk_menu_new (); guint8 *value = NULL; + menu = gtk_menu_new (); menuitem = gtk_menu_item_new_with_label ("Perceptual"); gtk_menu_append (GTK_MENU (menu), menuitem); @@@@ -1685,6 +1703,8 @@@@ cms_assign_dialog(GImage *image) GtkWidget *label = NULL; GtkWidget *vbox = NULL; GtkWidget *alignment = NULL; + CMSProfile *current_profile; + GString *profile_string; CMSAssignDialogData *data=g_new(CMSAssignDialogData,1); data->image = image; @@@@ -1700,8 +1720,8 @@@@ cms_assign_dialog(GImage *image) table = gtk_table_new(3, 1, FALSE); gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0); - CMSProfile *current_profile = gimage_get_cms_profile(image); - GString *profile_string = g_string_new(NULL); + current_profile = gimage_get_cms_profile(image); + profile_string = g_string_new(NULL); if (current_profile == NULL) { g_string_sprintf (profile_string, "[The currently assigned profile is: [none]]"); @@@@ -1792,6 +1812,7 @@@@ cms_open_assign_dialog(GImage *image) GSList *radiogroup = NULL; GtkWidget *vbox = NULL; GtkWidget *alignment = NULL; + GString *profile_string; CMSOpenAssignDialogData *data=g_new(CMSOpenAssignDialogData,1); data->image = image; @@@@ -1821,7 +1842,7 @@@@ cms_open_assign_dialog(GImage *image) data->profile_menu = cms_profile_menu_new(GTK_TABLE(table), 1, 0, TRUE); - GString *profile_string = g_string_new(NULL); + profile_string = g_string_new(NULL); if (cms_default_image_profile_name == NULL) { g_string_sprintf (profile_string, "The default image profile: [none]"); } @@@@ -1888,9 +1909,10 @@@@ cms_open_assign_dialog_ok_callback(GtkWi /* update cms_open_action (global preference variable) */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->always_default_check))) - { cms_open_action = CMS_ASSIGN_DEFAULT; + { GList *update_settings = NULL; GList *remove_settings = NULL; + cms_open_action = CMS_ASSIGN_DEFAULT; update_settings = g_list_append(update_settings, "cms-open-action"); save_gimprc(&update_settings, &remove_settings); g_list_free(update_settings); @@@@ -1939,6 +1961,7 @@@@ cms_convert_on_open_prompt(GImage *image GtkWidget *table; GtkWidget *vbox; GtkWidget *alignment; + gboolean return_value; CMSConvertOnOpenPromptData *data = g_new(CMSConvertOnOpenPromptData, 1); @@@@ -2010,7 +2033,7 @@@@ cms_convert_on_open_prompt(GImage *image data->event_loop = g_main_new(FALSE); g_main_run(data->event_loop); - gboolean return_value = data->return_value; + return_value = data->return_value; g_main_destroy(data->event_loop); g_free(data); d22 9 a30 11 @@@@ -2023,9 +2046,9 @@@@ cms_convert_on_open_prompt_yes_callback { data->return_value = TRUE; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->auto_convert_check))) { /* cms_auto_convert is global preference variable */ - cms_mismatch_action = CMS_MISMATCH_AUTO_CONVERT; GList *update_settings = NULL; GList *remove_settings = NULL; + cms_mismatch_action = CMS_MISMATCH_AUTO_CONVERT; update_settings = g_list_append(update_settings, "cms-mismatch-action"); save_gimprc(&update_settings, &remove_settings); g_list_free(update_settings); @ 1.2 log @update to 0.19.1 changes: The CinePaint versin 0.19-1 is a minor release. Overall stability has improved. Instant colourmanaging is more convenient. Memory handling for plug-ins is better. Portablility has improved and many bugs where fixed. Some plug-ins where added to the release: The print plug-in utilises Gutenprint for throughout 16-bit colourmanaged printing. Note Gutenprint will be colour stable once it lefts behind beta status. The collect plug-in allows for selecting a number of images with the same bit depth and building a layered image from them. The new ICC Examin plug-in allowes visualisation of actual ICC profiles tags. The new ICC Watch plug-in allowes viewing image colours in the actual colour gamut. Note the last two plug-ins need the "ICC Examin" application downloadable from www.behrmann.name . The 'zoom in' shortcut has changed from '=', which was not available for many non us keyboard layouts, to '+' . @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Added lots of patches to build cinepaint on NetBSD-1.6.2 using gcc-2.95.3. These patches have been submitted to the upstream authors. Approved by wiz. @ text @d3 3 a5 5 gcc-2.95.3 cannot handle declarations intermixed with code. --- app/cms.c.orig Tue Nov 23 12:58:15 2004 +++ app/cms.c Wed Mar 16 18:11:19 2005 @@@@ -202,7 +202,12 @@@@ erase_alpha_from_4th_color (CMSTransform d19 1 a19 1 @@@@ -216,9 +221,6 @@@@ void cms_init() d29 1 a29 1 @@@@ -476,11 +478,12 @@@@ cms_read_icc_profile_dir(gchar *path, ic d43 1 a43 1 @@@@ -517,6 +520,7 @@@@ cms_read_standard_profile_dirs(icProfile d51 1 a51 1 @@@@ -531,7 +535,7 @@@@ cms_read_standard_profile_dirs(icProfile d60 1 a60 1 @@@@ -673,6 +677,7 @@@@ cms_load_profile_to_mem (char* filename, d65 5 a69 5 /* get profile information */ cmsHPROFILE profile = cmsOpenProfileFromFile (file_name, "r"); @@@@ -682,7 +687,7 @@@@ cms_get_profile_from_file(char *file_nam } d74 1 a74 1 (gpointer) cms_get_long_profile_info(profile)); d77 1 a77 1 @@@@ -719,7 +724,8 @@@@ cms_get_profile_from_file(char *file_nam d87 1 a87 1 @@@@ -728,7 +734,7 @@@@ cms_get_profile_from_mem(void *mem_point d93 1 a93 1 (gpointer) cms_get_long_profile_info(profile)); d96 1 a96 1 @@@@ -788,6 +794,7 @@@@ cms_get_profile_data(CMSProfile *profile d104 1 a104 1 @@@@ -797,7 +804,7 @@@@ cms_get_lab_profile(LPcmsCIExyY white_po d113 1 a113 1 @@@@ -970,12 +977,13 @@@@ cms_return_profile(CMSProfile *profile) d128 1 a128 1 @@@@ -1008,7 +1016,18 @@@@ cms_get_transform(GSList *profiles, d147 1 a147 1 @@@@ -1028,12 +1047,9 @@@@ cms_get_transform(GSList *profiles, d162 1 a162 1 @@@@ -1050,7 +1066,7 @@@@ cms_get_transform(GSList *profiles, d171 1 a171 1 @@@@ -1079,7 +1095,6 @@@@ cms_get_transform(GSList *profiles, d179 1 a179 1 @@@@ -1093,8 +1108,8 @@@@ cms_get_transform(GSList *profiles, d190 1 a190 1 @@@@ -1218,6 +1233,12 @@@@ cms_set_display_profile(CMSProfile *prof d203 1 a203 1 @@@@ -1245,12 +1266,6 @@@@ cms_transform_area(CMSTransform *transfo d216 1 a216 1 @@@@ -1321,6 +1336,9 @@@@ void d222 1 a222 2 + if (transform <= 1 || !transform->handle) d225 1 a225 1 @@@@ -1328,9 +1346,9 @@@@ cms_transform_float(CMSTransform *transf d238 1 a238 1 @@@@ -1371,10 +1389,14 @@@@ static GtkWidget *cms_profile_menu_new(G d254 1 a254 1 @@@@ -1382,9 +1404,6 @@@@ static GtkWidget *cms_profile_menu_new(G d264 1 a264 1 @@@@ -1414,8 +1433,8 @@@@ static GtkWidget *cms_intent_menu_new(Gt d274 1 a274 1 @@@@ -1593,6 +1612,8 @@@@ cms_assign_dialog(GImage *image) d283 1 a283 1 @@@@ -1608,8 +1629,8 @@@@ cms_assign_dialog(GImage *image) d294 1 a294 1 @@@@ -1700,6 +1721,7 @@@@ cms_open_assign_dialog(GImage *image) d302 1 a302 1 @@@@ -1729,7 +1751,7 @@@@ cms_open_assign_dialog(GImage *image) d311 1 a311 1 @@@@ -1796,9 +1818,10 @@@@ cms_open_assign_dialog_ok_callback(GtkWi d323 1 a323 1 @@@@ -1847,6 +1870,7 @@@@ cms_convert_on_open_prompt(GImage *image d331 1 a331 1 @@@@ -1918,7 +1942,7 @@@@ cms_convert_on_open_prompt(GImage *image d340 1 a340 1 @@@@ -1931,9 +1955,9 @@@@ cms_convert_on_open_prompt_yes_callback @