[Rawstudio-commit] r1972 - trunk/src
Anders Brander
anders at brander.dk
Mon Sep 1 20:22:49 CEST 2008
Author: abrander
Date: 2008-09-01 20:22:49 +0200 (Mon, 01 Sep 2008)
New Revision: 1972
Modified:
trunk/src/conf_interface.c
trunk/src/gtk-helper.c
trunk/src/gtk-interface.c
trunk/src/rawstudio.c
trunk/src/rawstudio.h
trunk/src/rs-cms.c
trunk/src/rs-cms.h
Log:
Unified CMS-defines.
Modified: trunk/src/conf_interface.c
===================================================================
--- trunk/src/conf_interface.c 2008-09-01 17:35:08 UTC (rev 1971)
+++ trunk/src/conf_interface.c 2008-09-01 18:22:49 UTC (rev 1972)
@@ -395,19 +395,19 @@
{
gchar *ret = NULL;
gint selected = 0;
- if (type == RS_CMS_PROFILE_IN)
+ if (type == CMS_PROFILE_INPUT)
{
rs_conf_get_integer(CONF_CMS_IN_PROFILE_SELECTED, &selected);
if (selected > 0)
ret = rs_conf_get_nth_string_from_list_string(CONF_CMS_IN_PROFILE_LIST, --selected);
}
- else if (type == RS_CMS_PROFILE_DISPLAY)
+ else if (type == CMS_PROFILE_DISPLAY)
{
rs_conf_get_integer(CONF_CMS_DI_PROFILE_SELECTED, &selected);
if (selected > 0)
ret = rs_conf_get_nth_string_from_list_string(CONF_CMS_DI_PROFILE_LIST, --selected);
}
- else if (type == RS_CMS_PROFILE_EXPORT)
+ else if (type == CMS_PROFILE_EXPORT)
{
rs_conf_get_integer(CONF_CMS_EX_PROFILE_SELECTED, &selected);
if (selected > 0)
Modified: trunk/src/gtk-helper.c
===================================================================
--- trunk/src/gtk-helper.c 2008-09-01 17:35:08 UTC (rev 1971)
+++ trunk/src/gtk-helper.c 2008-09-01 18:22:49 UTC (rev 1972)
@@ -374,7 +374,7 @@
RS_BLOB *rs = (RS_BLOB *) user_data;
rs_conf_set_boolean(CONF_CMS_ENABLED, togglebutton->active);
rs_cms_enable(rs->cms, togglebutton->active);
- rs_preview_widget_set_cms(RS_PREVIEW_WIDGET(rs->preview), rs_cms_get_transform(rs->cms, PROFILE_DISPLAY));
+ rs_preview_widget_set_cms(RS_PREVIEW_WIDGET(rs->preview), rs_cms_get_transform(rs->cms, TRANSFORM_DISPLAY));
return;
}
@@ -384,8 +384,8 @@
RS_BLOB *rs = (RS_BLOB *) user_data;
gchar *filename;
rs_conf_set_integer(CONF_CMS_IN_PROFILE_SELECTED, gtk_combo_box_get_active(GTK_COMBO_BOX(combobox)));
- filename = rs_conf_get_cms_profile(RS_CMS_PROFILE_IN);
- rs_cms_set_profile(rs->cms, PROFILE_INPUT, filename);
+ filename = rs_conf_get_cms_profile(CMS_PROFILE_INPUT);
+ rs_cms_set_profile(rs->cms, CMS_PROFILE_INPUT, filename);
g_free(filename);
rs_preview_widget_update(RS_PREVIEW_WIDGET(rs->preview), FALSE);
return;
@@ -398,8 +398,8 @@
gchar *filename;
rs_conf_set_integer(CONF_CMS_DI_PROFILE_SELECTED, gtk_combo_box_get_active(GTK_COMBO_BOX(combobox)));
- filename = rs_conf_get_cms_profile(RS_CMS_PROFILE_DISPLAY);
- rs_cms_set_profile(rs->cms, PROFILE_DISPLAY, filename);
+ filename = rs_conf_get_cms_profile(CMS_PROFILE_DISPLAY);
+ rs_cms_set_profile(rs->cms, CMS_PROFILE_DISPLAY, filename);
g_free(filename);
rs_preview_widget_update(RS_PREVIEW_WIDGET(rs->preview), FALSE);
return;
@@ -412,8 +412,8 @@
gchar *filename;
rs_conf_set_integer(CONF_CMS_EX_PROFILE_SELECTED, gtk_combo_box_get_active(GTK_COMBO_BOX(combobox)));
- filename = rs_conf_get_cms_profile(RS_CMS_PROFILE_EXPORT);
- rs_cms_set_profile(rs->cms, PROFILE_EXPORT, filename);
+ filename = rs_conf_get_cms_profile(CMS_PROFILE_EXPORT);
+ rs_cms_set_profile(rs->cms, CMS_PROFILE_EXPORT, filename);
g_free(filename);
return;
}
@@ -505,7 +505,7 @@
GtkWidget *combobox = GTK_WIDGET(user_data);
gchar *filename;
- filename = gui_cms_choose_profile(NULL, PROFILE_INPUT);
+ filename = gui_cms_choose_profile(NULL, CMS_PROFILE_INPUT);
if (filename)
{
@@ -524,7 +524,7 @@
GtkWidget *combobox = GTK_WIDGET(user_data);
gchar *filename;
- filename = gui_cms_choose_profile(NULL, PROFILE_DISPLAY);
+ filename = gui_cms_choose_profile(NULL, CMS_PROFILE_DISPLAY);
if (filename)
{
@@ -543,7 +543,7 @@
GtkWidget *combobox = GTK_WIDGET(user_data);
gchar *filename;
- filename = gui_cms_choose_profile(NULL, PROFILE_EXPORT);
+ filename = gui_cms_choose_profile(NULL, CMS_PROFILE_EXPORT);
if (filename)
{
Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c 2008-09-01 17:35:08 UTC (rev 1971)
+++ trunk/src/gtk-interface.c 2008-09-01 18:22:49 UTC (rev 1972)
@@ -959,7 +959,7 @@
/* Preview area */
rs->preview = rs_preview_widget_new();
- rs_preview_widget_set_cms(RS_PREVIEW_WIDGET(rs->preview), rs_cms_get_transform(rs->cms, PROFILE_DISPLAY));
+ rs_preview_widget_set_cms(RS_PREVIEW_WIDGET(rs->preview), rs_cms_get_transform(rs->cms, TRANSFORM_DISPLAY));
rs_conf_get_color(CONF_PREBGCOLOR, &bgcolor);
rs_preview_widget_set_bgcolor(RS_PREVIEW_WIDGET(rs->preview), &bgcolor);
g_signal_connect(G_OBJECT(rs->preview), "wb-picked", G_CALLBACK(preview_wb_picked), rs);
Modified: trunk/src/rawstudio.c
===================================================================
--- trunk/src/rawstudio.c 2008-09-01 17:35:08 UTC (rev 1971)
+++ trunk/src/rawstudio.c 2008-09-01 18:22:49 UTC (rev 1972)
@@ -583,7 +583,7 @@
else if (quality < 0)
quality = 0;
- rs_jpeg_save(pixbuf, filename, quality, rs_cms_get_profile_filename(cms, PROFILE_EXPORT));
+ rs_jpeg_save(pixbuf, filename, quality, rs_cms_get_profile_filename(cms, CMS_PROFILE_EXPORT));
g_object_unref(pixbuf);
break;
case FILETYPE_PNG:
@@ -598,7 +598,7 @@
rs_conf_get_boolean(CONF_EXPORT_TIFF_UNCOMPRESSED, &uncompressed_tiff);
rs_color_transform_transform(rct, rsi->w, rsi->h, rsi->pixels,
rsi->rowstride, gdk_pixbuf_get_pixels(pixbuf), gdk_pixbuf_get_rowstride(pixbuf));
- rs_tiff8_save(pixbuf, filename, rs_cms_get_profile_filename(cms, PROFILE_EXPORT), uncompressed_tiff);
+ rs_tiff8_save(pixbuf, filename, rs_cms_get_profile_filename(cms, CMS_PROFILE_EXPORT), uncompressed_tiff);
g_object_unref(pixbuf);
break;
case FILETYPE_TIFF16:
@@ -608,7 +608,7 @@
rs_color_transform_transform(rct, rsi->w, rsi->h,
rsi->pixels, rsi->rowstride,
image16->pixels, image16->rowstride*2);
- rs_tiff16_save(image16, filename, rs_cms_get_profile_filename(cms, PROFILE_EXPORT), uncompressed_tiff);
+ rs_tiff16_save(image16, filename, rs_cms_get_profile_filename(cms, CMS_PROFILE_EXPORT), uncompressed_tiff);
rs_image16_free(image16);
break;
}
Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h 2008-09-01 17:35:08 UTC (rev 1971)
+++ trunk/src/rawstudio.h 2008-09-01 18:22:49 UTC (rev 1972)
@@ -91,12 +91,6 @@
};
enum {
- RS_CMS_PROFILE_IN,
- RS_CMS_PROFILE_DISPLAY,
- RS_CMS_PROFILE_EXPORT
-};
-
-enum {
ROI_GRID_NONE = 0,
ROI_GRID_GOLDEN,
ROI_GRID_THIRDS,
Modified: trunk/src/rs-cms.c
===================================================================
--- trunk/src/rs-cms.c 2008-09-01 17:35:08 UTC (rev 1971)
+++ trunk/src/rs-cms.c 2008-09-01 18:22:49 UTC (rev 1972)
@@ -30,8 +30,8 @@
void *genericLoadProfile;
void *genericRGBProfile;
void *transforms[TRANSFORMS];
- void *profiles[PROFILES];
- gchar *profile_filenames[PROFILES];
+ void *profiles[CMS_PROFILES];
+ gchar *profile_filenames[CMS_PROFILES];
};
/* LCMS is not guaranteed to be thread-safe, we have to do this for now :( */
@@ -71,7 +71,7 @@
if (cmsGetColorSpace(lcms_profile) == 0x52474220) /* we only support RGB-profiles */
{
/* Perceptual is the fall-back method of LittleCMS */
- if (profile == PROFILE_INPUT)
+ if (profile == CMS_PROFILE_INPUT)
ret = cmsIsIntentSupported(lcms_profile, INTENT_PERCEPTUAL, LCMS_USED_AS_INPUT);
else
ret = cmsIsIntentSupported(lcms_profile, INTENT_PERCEPTUAL, LCMS_USED_AS_OUTPUT);
@@ -86,7 +86,7 @@
void
rs_cms_set_profile(RS_CMS *cms, CMS_PROFILE profile, const gchar *filename)
{
- if (profile > (PROFILES-1)) return;
+ if (profile > (CMS_PROFILES-1)) return;
CMS_LOCK();
@@ -118,7 +118,7 @@
gchar *
rs_cms_get_profile_filename(RS_CMS *cms, CMS_PROFILE profile)
{
- if (profile > (PROFILES-1)) return(NULL);
+ if (profile > (CMS_PROFILES-1)) return(NULL);
if (cms->enabled)
return(cms->profile_filenames[profile]);
@@ -206,18 +206,18 @@
if (cms->enabled)
{
- if (cms->profiles[PROFILE_INPUT] && cmsIsIntentSupported(cms->profiles[PROFILE_INPUT], cms->intent, LCMS_USED_AS_INPUT))
- in = cms->profiles[PROFILE_INPUT];
+ if (cms->profiles[CMS_PROFILE_INPUT] && cmsIsIntentSupported(cms->profiles[CMS_PROFILE_INPUT], cms->intent, LCMS_USED_AS_INPUT))
+ in = cms->profiles[CMS_PROFILE_INPUT];
else
in = genericLoadProfile;
- if (cms->profiles[PROFILE_DISPLAY] && cmsIsIntentSupported(cms->profiles[PROFILE_DISPLAY], cms->intent, LCMS_USED_AS_OUTPUT))
- di = cms->profiles[PROFILE_DISPLAY];
+ if (cms->profiles[CMS_PROFILE_DISPLAY] && cmsIsIntentSupported(cms->profiles[CMS_PROFILE_DISPLAY], cms->intent, LCMS_USED_AS_OUTPUT))
+ di = cms->profiles[CMS_PROFILE_DISPLAY];
else
di = genericRGBProfile;
- if (cms->profiles[PROFILE_EXPORT] && cmsIsIntentSupported(cms->profiles[PROFILE_EXPORT], cms->intent, LCMS_USED_AS_OUTPUT))
- ex = cms->profiles[PROFILE_EXPORT];
+ if (cms->profiles[CMS_PROFILE_EXPORT] && cmsIsIntentSupported(cms->profiles[CMS_PROFILE_EXPORT], cms->intent, LCMS_USED_AS_OUTPUT))
+ ex = cms->profiles[CMS_PROFILE_EXPORT];
else
ex = genericRGBProfile;
@@ -297,30 +297,30 @@
/* initialize arrays */
for (n=0;n<TRANSFORMS;n++)
cms->transforms[n] = NULL;
- for (n=0;n<PROFILES;n++)
+ for (n=0;n<CMS_PROFILES;n++)
{
cms->profiles[n] = NULL;
cms->profile_filenames[n] = NULL;
}
- filename = rs_conf_get_cms_profile(RS_CMS_PROFILE_IN);
+ filename = rs_conf_get_cms_profile(CMS_PROFILE_INPUT);
if (filename)
{
- rs_cms_set_profile(cms, PROFILE_INPUT, filename);
+ rs_cms_set_profile(cms, CMS_PROFILE_INPUT, filename);
g_free(filename);
}
- filename = rs_conf_get_cms_profile(RS_CMS_PROFILE_DISPLAY);
+ filename = rs_conf_get_cms_profile(CMS_PROFILE_DISPLAY);
if (filename)
{
- rs_cms_set_profile(cms, PROFILE_DISPLAY, filename);
+ rs_cms_set_profile(cms, CMS_PROFILE_DISPLAY, filename);
g_free(filename);
}
- filename = rs_conf_get_cms_profile(RS_CMS_PROFILE_EXPORT);
+ filename = rs_conf_get_cms_profile(CMS_PROFILE_EXPORT);
if (filename)
{
- rs_cms_set_profile(cms, PROFILE_EXPORT, filename);
+ rs_cms_set_profile(cms, CMS_PROFILE_EXPORT, filename);
g_free(filename);
}
Modified: trunk/src/rs-cms.h
===================================================================
--- trunk/src/rs-cms.h 2008-09-01 17:35:08 UTC (rev 1971)
+++ trunk/src/rs-cms.h 2008-09-01 18:22:49 UTC (rev 1972)
@@ -29,10 +29,10 @@
} CMS_TRANSFORM;
typedef enum {
- PROFILE_INPUT = 0,
- PROFILE_DISPLAY,
- PROFILE_EXPORT,
- PROFILES
+ CMS_PROFILE_INPUT = 0,
+ CMS_PROFILE_DISPLAY,
+ CMS_PROFILE_EXPORT,
+ CMS_PROFILES
} CMS_PROFILE;
typedef struct _RS_CMS RS_CMS;
@@ -45,6 +45,7 @@
extern gint rs_cms_get_intent(RS_CMS *cms);
extern void *rs_cms_get_transform(RS_CMS *cms, CMS_TRANSFORM transform);
extern void rs_cms_prepare_transforms(RS_CMS *cms);
+extern void rs_cms_do_transform(gpointer transform, gpointer input, gpointer output, guint size);
extern RS_CMS *rs_cms_init(void);
#endif /* RS_CMS_H */
More information about the Rawstudio-commit
mailing list