callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put up messages telling user about corrupted palette files as we load

Browse Source 
Mon May  3 21:44:27 BST 1999  Austin Donnelly  <austin@gimp.org>

	* app/palette.c: put up messages telling user about corrupted
 	    palette files as we load them.  In particular, try and catch
 	    MSDOS format files such as those distributed from Visibone's
 	    website.
This commit is contained in:
BST 1999 Austin Donnelly
1999-05-03 20:44:01 +00:00
committed by Austin Donnelly
parent 66b603f426
commit 2c0adc456a
4 changed files with 134 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,6 +1,13 @@
Mon May 3 21:44:27 BST 1999 Austin Donnelly <austin@gimp.org>
* app/palette.c: put up messages telling user about corrupted
palette files as we load them. In particular, try and catch
MSDOS format files such as those distributed from Visibone's
website.
Mon May 3 21:30:46 CEST 1999 Marc Lehmann <pcg@goof.com>
* configure.in: changed order of cflags and library path in
* configure.in: changed order of cflags and library path in
GIMP_CLFAGS and GIMP_LIBS.
Mon May 3 12:04:47 PDT 1999 Manish Singh <yosh@gimp.org>

47
app/gui/palette-editor.c
View File

@ -589,6 +589,7 @@ palette_entries_load (char *filename)
char *tok;
FILE *fp;
int r, g, b;
int linenum;
GSList *list;
gint pos = 0;
PaletteEntriesP p_entries = NULL;
@ -609,38 +610,74 @@ palette_entries_load (char *filename)
if (!(fp = fopen (filename, "rb")))
{
palette_entries_free (entries);
g_warning (_("failed to open palette file %s: can't happen?"), filename);
return;
}
linenum = 0;
fread (str, 13, 1, fp);
str[13] = '\0';
linenum++;
if (strcmp (str, "GIMP Palette\n"))
{
/* bad magic, but maybe it has \r\n at the end of lines? */
if (!strcmp (str, "GIMP Palette\r"))
g_message (_("Loading palette %s:\nCorrupt palette: missing magic header\nDoes this file need converting from DOS?"), filename);
else
g_message (_("Loading palette %s:\nCorrupt palette: missing magic header"), filename);
fclose (fp);
palette_entries_free (entries);
return;
}
while (!feof (fp))
{
if (!fgets (str, 512, fp))
continue;
{
if (feof (fp))
break;
g_message (_("Loading palette %s (line %d):\nRead error"),
filename, linenum);
fclose (fp);
palette_entries_free (entries);
return;
}
linenum++;
if (str[0] != '#')
{
tok = strtok (str, " \t");
if (tok)
if (tok) {
r = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing RED component"), filename, linenum);
/* maybe we should just abort? */
}
tok = strtok (NULL, " \t");
if (tok)
if (tok) {
g = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing GREEN component"), filename, linenum);
}
tok = strtok (NULL, " \t");
if (tok)
if (tok) {
b = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing BLUE component"), filename, linenum);
}
/* optional name */
tok = strtok (NULL, "\n");
if (r < 0 || r > 255 ||
g < 0 || g > 255 ||
b < 0 || b > 255)
g_message (_("Loading palette %s (line %d):\nRGB value out of range"), filename, linenum);
palette_add_entry (entries, tok, r, g, b);
} /* if */
} /* while */
@ -651,7 +688,7 @@ palette_entries_load (char *filename)
entries->changed = 0;
list = palette_entries_list;
while (list)
{
p_entries = (PaletteEntriesP) list->data;

47
app/palette.c
View File

@ -589,6 +589,7 @@ palette_entries_load (char *filename)
char *tok;
FILE *fp;
int r, g, b;
int linenum;
GSList *list;
gint pos = 0;
PaletteEntriesP p_entries = NULL;
@ -609,38 +610,74 @@ palette_entries_load (char *filename)
if (!(fp = fopen (filename, "rb")))
{
palette_entries_free (entries);
g_warning (_("failed to open palette file %s: can't happen?"), filename);
return;
}
linenum = 0;
fread (str, 13, 1, fp);
str[13] = '\0';
linenum++;
if (strcmp (str, "GIMP Palette\n"))
{
/* bad magic, but maybe it has \r\n at the end of lines? */
if (!strcmp (str, "GIMP Palette\r"))
g_message (_("Loading palette %s:\nCorrupt palette: missing magic header\nDoes this file need converting from DOS?"), filename);
else
g_message (_("Loading palette %s:\nCorrupt palette: missing magic header"), filename);
fclose (fp);
palette_entries_free (entries);
return;
}
while (!feof (fp))
{
if (!fgets (str, 512, fp))
continue;
{
if (feof (fp))
break;
g_message (_("Loading palette %s (line %d):\nRead error"),
filename, linenum);
fclose (fp);
palette_entries_free (entries);
return;
}
linenum++;
if (str[0] != '#')
{
tok = strtok (str, " \t");
if (tok)
if (tok) {
r = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing RED component"), filename, linenum);
/* maybe we should just abort? */
}
tok = strtok (NULL, " \t");
if (tok)
if (tok) {
g = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing GREEN component"), filename, linenum);
}
tok = strtok (NULL, " \t");
if (tok)
if (tok) {
b = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing BLUE component"), filename, linenum);
}
/* optional name */
tok = strtok (NULL, "\n");
if (r < 0 || r > 255 ||
g < 0 || g > 255 ||
b < 0 || b > 255)
g_message (_("Loading palette %s (line %d):\nRGB value out of range"), filename, linenum);
palette_add_entry (entries, tok, r, g, b);
} /* if */
} /* while */
@ -651,7 +688,7 @@ palette_entries_load (char *filename)
entries->changed = 0;
list = palette_entries_list;
while (list)
{
p_entries = (PaletteEntriesP) list->data;

47
app/widgets/gimppaletteeditor.c
View File

@ -589,6 +589,7 @@ palette_entries_load (char *filename)
char *tok;
FILE *fp;
int r, g, b;
int linenum;
GSList *list;
gint pos = 0;
PaletteEntriesP p_entries = NULL;
@ -609,38 +610,74 @@ palette_entries_load (char *filename)
if (!(fp = fopen (filename, "rb")))
{
palette_entries_free (entries);
g_warning (_("failed to open palette file %s: can't happen?"), filename);
return;
}
linenum = 0;
fread (str, 13, 1, fp);
str[13] = '\0';
linenum++;
if (strcmp (str, "GIMP Palette\n"))
{
/* bad magic, but maybe it has \r\n at the end of lines? */
if (!strcmp (str, "GIMP Palette\r"))
g_message (_("Loading palette %s:\nCorrupt palette: missing magic header\nDoes this file need converting from DOS?"), filename);
else
g_message (_("Loading palette %s:\nCorrupt palette: missing magic header"), filename);
fclose (fp);
palette_entries_free (entries);
return;
}
while (!feof (fp))
{
if (!fgets (str, 512, fp))
continue;
{
if (feof (fp))
break;
g_message (_("Loading palette %s (line %d):\nRead error"),
filename, linenum);
fclose (fp);
palette_entries_free (entries);
return;
}
linenum++;
if (str[0] != '#')
{
tok = strtok (str, " \t");
if (tok)
if (tok) {
r = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing RED component"), filename, linenum);
/* maybe we should just abort? */
}
tok = strtok (NULL, " \t");
if (tok)
if (tok) {
g = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing GREEN component"), filename, linenum);
}
tok = strtok (NULL, " \t");
if (tok)
if (tok) {
b = atoi (tok);
} else {
g_message (_("Loading palette %s (line %d):\nMissing BLUE component"), filename, linenum);
}
/* optional name */
tok = strtok (NULL, "\n");
if (r < 0 || r > 255 ||
g < 0 || g > 255 ||
b < 0 || b > 255)
g_message (_("Loading palette %s (line %d):\nRGB value out of range"), filename, linenum);
palette_add_entry (entries, tok, r, g, b);
} /* if */
} /* while */
@ -651,7 +688,7 @@ palette_entries_load (char *filename)
entries->changed = 0;
list = palette_entries_list;
while (list)
{
p_entries = (PaletteEntriesP) list->data;