dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/core/gimppalette-import.c applied slightly modified version of a patch 

2007-08-07  Sven Neumann  <sven@gimp.org>

	* app/core/gimppalette-import.c
	* app/core/gimppalette-load.[ch]: applied slightly modified version
	of a patch from Nicola Archibald that adds support for importing
	Adobe Color palette version 1 files (bug ).

svn path=/trunk/; revision=23134
This commit is contained in:
Sven Neumann 2007-08-07 13:42:55 +00:00 committed by Sven Neumann
parent 900f54e69f
commit 2b2cc44ad0
4 changed files with 178 additions and 6 deletions

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-08-07 Sven Neumann <sven@gimp.org>
* app/core/gimppalette-import.c
* app/core/gimppalette-load.[ch]: applied slightly modified version
of a patch from Nicola Archibald that adds support for importing
Adobe Color palette version 1 files (bug #316618).
2007-08-07 Sven Neumann <sven@gimp.org> 2007-08-07 Sven Neumann <sven@gimp.org>
* app/gui/gui-vtable.c (gui_pdb_dialog_new): as a workaround for * app/gui/gui-vtable.c (gui_pdb_dialog_new): as a workaround for

4
app/core/gimppalette-import.c
View File

@ -511,6 +511,10 @@ gimp_palette_import_from_file (const gchar *filename,
palette_list = gimp_palette_load_psp (filename, error); palette_list = gimp_palette_load_psp (filename, error);
break; break;
case GIMP_PALETTE_FILE_FORMAT_ACO:
palette_list = gimp_palette_load_aco (filename, error);
break;
default: default:
g_set_error (error, g_set_error (error,
GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,

168
app/core/gimppalette-load.c
View File

@ -430,13 +430,156 @@ gimp_palette_load_psp (const gchar *filename,
return g_list_prepend (NULL, palette); return g_list_prepend (NULL, palette);
} }
GList *
gimp_palette_load_aco (const gchar *filename,
GError **error)
{
GimpPalette *palette;
gchar *palette_name;
gint fd;
gint format_version;
gint number_of_colors;
gint i;
gchar header[4];
gchar color_info[10];
gchar format2_preamble[4];
gint status;
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (g_path_is_absolute (filename), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
fd = g_open (filename, O_RDONLY | _O_BINARY, 0);
if (! fd)
{
g_set_error (error,
G_FILE_ERROR, g_file_error_from_errno (errno),
_("Could not open '%s' for reading: %s"),
gimp_filename_to_utf8 (filename), g_strerror (errno));
return NULL;
}
palette_name = g_filename_display_basename (filename);
palette = GIMP_PALETTE (gimp_palette_new (palette_name));
g_free (palette_name);
status = read(fd, header, sizeof (header));
if (status < 0)
{
close(fd);
return g_list_prepend (NULL, palette);
}
format_version = header[1] + (header[0] << 8);
number_of_colors = header[3] + (header[2] << 8);
for (i = 0; i < number_of_colors; i++)
{
gint color_space;
gint w, x, y, z;
gboolean color_ok = FALSE;
GimpRGB color;
read (fd, color_info, sizeof (color_info));
color_space = color_info[1] + (color_info[0] << 8);
w = (guchar) color_info[3] + ((guchar) color_info[2] << 8);
x = (guchar) color_info[5] + ((guchar) color_info[4] << 8);
y = (guchar) color_info[7] + ((guchar) color_info[6] << 8);
z = (guchar) color_info[9] + ((guchar) color_info[8] << 8);
if (color_space == 0) /* RGB */
{
gdouble R = ((gdouble) w) / 65536.0;
gdouble G = ((gdouble) x) / 65536.0;
gdouble B = ((gdouble) y) / 65536.0;
gimp_rgba_set (&color, R, G, B, 1.0);
color_ok = TRUE;
}
else if (color_space == 1) /* HSV */
{
GimpHSV hsv;
gdouble H = ((gdouble) w) / 65536.0;
gdouble S = ((gdouble) x) / 65536.0;
gdouble V = ((gdouble) y) / 65536.0;
gimp_hsva_set (&hsv, H, S, V, 1.0);
gimp_hsv_to_rgb (&hsv, &color);
color_ok = TRUE;
}
else if (color_space == 2) /* CMYK */
{
GimpCMYK cmyk;
gdouble C = 1.0 - (((gdouble) w) / 65536.0);
gdouble M = 1.0 - (((gdouble) x) / 65536.0);
gdouble Y = 1.0 - (((gdouble) y) / 65536.0);
gdouble K = 1.0 - (((gdouble) z) / 65536.0);
gimp_cmyka_set (&cmyk, C, M, Y, K, 1.0);
gimp_cmyk_to_rgb (&cmyk, &color);
color_ok = TRUE;
}
else if (color_space == 8) /* Grayscale */
{
gdouble K = 1.0 - (((gdouble) w) / 10000.0);
gimp_rgba_set (&color, K, K, K, 1.0);
color_ok = TRUE;
}
else if (color_space == 9) /* Wide? CMYK */
{
GimpCMYK cmyk;
gdouble C = 1.0 - (((gdouble) w) / 10000.0);
gdouble M = 1.0 - (((gdouble) x) / 10000.0);
gdouble Y = 1.0 - (((gdouble) y) / 10000.0);
gdouble K = 1.0 - (((gdouble) z) / 10000.0);
gimp_cmyka_set (&cmyk, C, M, Y, K, 1.0);
gimp_cmyk_to_rgb (&cmyk, &color);
color_ok = TRUE;
}
else
{
g_printerr ("Unsupported color space (%d) in ACO file %s\n",
color_space, gimp_filename_to_utf8 (filename));
}
if (format_version == 2)
{
gint number_of_chars;
read (fd, format2_preamble, sizeof (format2_preamble));
number_of_chars = format2_preamble[3] + (format2_preamble[2] << 8);
lseek (fd, number_of_chars * 2, SEEK_SET);
}
if (color_ok)
gimp_palette_add_entry (palette, -1, NULL, &color);
}
close(fd);
return g_list_prepend (NULL, palette);
}
GimpPaletteFileFormat GimpPaletteFileFormat
gimp_palette_load_detect_format (const gchar *filename) gimp_palette_load_detect_format (const gchar *filename)
{ {
GimpPaletteFileFormat format = GIMP_PALETTE_FILE_FORMAT_UNKNOWN; GimpPaletteFileFormat format = GIMP_PALETTE_FILE_FORMAT_UNKNOWN;
gint fd; gint fd;
gchar header[16]; gchar header[16];
struct stat file_stat;
fd = g_open (filename, O_RDONLY | _O_BINARY, 0); fd = g_open (filename, O_RDONLY | _O_BINARY, 0);
if (fd) if (fd)
@ -445,7 +588,7 @@ gimp_palette_load_detect_format (const gchar *filename)
{ {
if (g_str_has_prefix (header + 0, "RIFF") && if (g_str_has_prefix (header + 0, "RIFF") &&
g_str_has_prefix (header + 8, "PAL data")) g_str_has_prefix (header + 8, "PAL data"))
{ {
format = GIMP_PALETTE_FILE_FORMAT_RIFF_PAL; format = GIMP_PALETTE_FILE_FORMAT_RIFF_PAL;
} }
else if (g_str_has_prefix (header, "GIMP Palette")) else if (g_str_has_prefix (header, "GIMP Palette"))
@ -458,10 +601,25 @@ gimp_palette_load_detect_format (const gchar *filename)
} }
} }
if (fstat (fd, &file_stat) >= 0) if (format == GIMP_PALETTE_FILE_FORMAT_UNKNOWN)
{ {
if (file_stat.st_size == 768) gchar *lower_filename = g_ascii_strdown (filename, -1);
format = GIMP_PALETTE_FILE_FORMAT_ACT;
if (g_str_has_suffix (lower_filename, ".aco"))
format = GIMP_PALETTE_FILE_FORMAT_ACO;
g_free (lower_filename);
}
if (format == GIMP_PALETTE_FILE_FORMAT_UNKNOWN)
{
struct stat file_stat;
if (fstat (fd, &file_stat) >= 0)
{
if (file_stat.st_size == 768)
format = GIMP_PALETTE_FILE_FORMAT_ACT;
}
} }
close (fd); close (fd);

5
app/core/gimppalette-load.h
View File

@ -29,7 +29,8 @@ typedef enum
GIMP_PALETTE_FILE_FORMAT_GPL, /* GIMP palette */ GIMP_PALETTE_FILE_FORMAT_GPL, /* GIMP palette */
GIMP_PALETTE_FILE_FORMAT_RIFF_PAL, /* RIFF palette */ GIMP_PALETTE_FILE_FORMAT_RIFF_PAL, /* RIFF palette */
GIMP_PALETTE_FILE_FORMAT_ACT, /* Photoshop binary color palette */ GIMP_PALETTE_FILE_FORMAT_ACT, /* Photoshop binary color palette */
GIMP_PALETTE_FILE_FORMAT_PSP_PAL /* JASC's Paint Shop Pro color palette */ GIMP_PALETTE_FILE_FORMAT_PSP_PAL, /* JASC's Paint Shop Pro color palette */
GIMP_PALETTE_FILE_FORMAT_ACO /* Photoshop ACO color file */
} GimpPaletteFileFormat; } GimpPaletteFileFormat;
@ -41,6 +42,8 @@ GList * gimp_palette_load_riff (const gchar *filename,
GError **error); GError **error);
GList * gimp_palette_load_psp (const gchar *filename, GList * gimp_palette_load_psp (const gchar *filename,
GError **error); GError **error);
GList * gimp_palette_load_aco (const gchar *filename,
GError **error);
GimpPaletteFileFormat gimp_palette_load_detect_format (const gchar *filename); GimpPaletteFileFormat gimp_palette_load_detect_format (const gchar *filename);