Commit 0f0da9c7 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

added missing quotes in test for libcurl.

2006-11-09  Sven Neumann  <sven@gimp.org>

	* configure.in: added missing quotes in test for libcurl.

	* app/plug-in/gimppluginprocedure.c
	(gimp_plug_in_procedure_add_menu_path): try not to crash on
	invalid menu paths and avoid a string copy for the common case.

	* app/composite/gimp-composite-mmx.c: commented out unused code.
parent 2f5c6f7b
2006-11-09 Sven Neumann <sven@gimp.org>
* configure.in: added missing quotes in test for libcurl.
* app/plug-in/gimppluginprocedure.c
(gimp_plug_in_procedure_add_menu_path): try not to crash on
invalid menu paths and avoid a string copy for the common case.
* app/composite/gimp-composite-mmx.c: commented out unused code.
2006-11-08 Simon Budig <simon@gimp.org>
* tools/defcheck.py: don't bail out successfully after the first test,
......
......@@ -45,7 +45,8 @@
#define pmaxub(a,b,tmp) "\tmovq %%" #a ", %%" #tmp ";" "psubusb %%" #b ", %%" #tmp ";" "paddb %%" #tmp ", %%" #b "\n"
void
#if 0
static void
debug_display_mmx(void)
{
#define mask32(x) ((x)& (unsigned long long) 0xFFFFFFFF)
......@@ -57,6 +58,7 @@ debug_display_mmx(void)
print64(mm6); printf(" "); print64(mm7); printf("\n");
printf("--------------------------------------------\n");
}
#endif
const guint32 rgba8_alpha_mask_64[2] = { 0xFF000000, 0xFF000000 };
const guint32 rgba8_b1_64[2] = { 0x01010101, 0x01010101 };
......@@ -828,6 +830,7 @@ gimp_composite_multiply_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op)
asm("emms");
}
#if 0
static void
mmx_op_overlay(void)
{
......@@ -877,6 +880,7 @@ mmx_op_overlay(void)
: "m" (*rgba8_w2_64), "m" (*rgba8_alpha_mask_64)
);
}
#endif
#if 0
void
......
......@@ -295,7 +295,6 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
{
GimpProcedure *procedure;
gchar *basename = NULL;
gchar *prefix;
const gchar *required = NULL;
gchar *p;
......@@ -305,14 +304,25 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
procedure = GIMP_PROCEDURE (proc);
prefix = g_strdup (menu_path);
p = strchr (menu_path, '>');
if (p == NULL || (*(++p) && *p != '/'))
{
basename = g_filename_display_basename (proc->prog);
p = strchr (prefix, '>') + 1;
if (p)
*p = '\0';
g_set_error (error, 0, 0,
"Plug-In \"%s\"\n(%s)\n"
"attempted to install procedure \"%s\"\n"
"in the invalid menu location \"%s\".\n"
"The menu path must look like either \"<Prefix>\" "
"or \"<Prefix>/path/to/item\".",
basename, gimp_filename_to_utf8 (proc->prog),
GIMP_OBJECT (proc)->name,
menu_path);
goto failure;
}
if (strcmp (prefix, "<Toolbox>") == 0 ||
strcmp (prefix, "<Image>") == 0)
if (g_str_has_prefix (menu_path, "<Toolbox>") ||
g_str_has_prefix (menu_path, "<Image>"))
{
if ((procedure->num_args < 1) ||
! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]))
......@@ -321,8 +331,8 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
goto failure;
}
}
else if (strcmp (prefix, "<Layers>") == 0 ||
strcmp (prefix, "<Channels>") == 0)
else if (g_str_has_prefix (menu_path, "<Layers>") ||
g_str_has_prefix (menu_path, "<Channels>"))
{
if ((procedure->num_args < 3) ||
! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]) ||
......@@ -333,7 +343,7 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
goto failure;
}
}
else if (strcmp (prefix, "<Vectors>") == 0)
else if (g_str_has_prefix (menu_path, "<Vectors>"))
{
if ((procedure->num_args < 3) ||
! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]) ||
......@@ -344,7 +354,7 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
goto failure;
}
}
else if (strcmp (prefix, "<ColormapEditor>") == 0)
else if (g_str_has_prefix (menu_path, "<ColormapEditor>"))
{
if ((procedure->num_args < 2) ||
! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]) ||
......@@ -354,7 +364,7 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
goto failure;
}
}
else if (strcmp (prefix, "<Load>") == 0)
else if (g_str_has_prefix (menu_path, "<Load>"))
{
if ((procedure->num_args < 3) ||
! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]) ||
......@@ -372,7 +382,7 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
goto failure;
}
}
else if (strcmp (prefix, "<Save>") == 0)
else if (g_str_has_prefix (menu_path, "<Save>"))
{
if ((procedure->num_args < 5) ||
! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]) ||
......@@ -385,12 +395,12 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
goto failure;
}
}
else if (strcmp (prefix, "<Brushes>") == 0 ||
strcmp (prefix, "<Gradients>") == 0 ||
strcmp (prefix, "<Palettes>") == 0 ||
strcmp (prefix, "<Patterns>") == 0 ||
strcmp (prefix, "<Fonts>") == 0 ||
strcmp (prefix, "<Buffers>") == 0)
else if (g_str_has_prefix (menu_path, "<Brushes>") ||
g_str_has_prefix (menu_path, "<Gradients>") ||
g_str_has_prefix (menu_path, "<Palettes>") ||
g_str_has_prefix (menu_path, "<Patterns>") ||
g_str_has_prefix (menu_path, "<Fonts>") ||
g_str_has_prefix (menu_path, "<Buffers>"))
{
if ((procedure->num_args < 1) ||
! GIMP_IS_PARAM_SPEC_INT32 (procedure->args[0]))
......@@ -418,25 +428,6 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
goto failure;
}
p = strchr (menu_path, '>') + 1;
if (*p != '/' && *p != '\0')
{
basename = g_filename_display_basename (proc->prog);
g_set_error (error, 0, 0,
"Plug-In \"%s\"\n(%s)\n"
"attempted to install procedure \"%s\"\n"
"in the invalid menu location \"%s\".\n"
"The menu path must look like either \"<Prefix>\" "
"or \"<Prefix>/path/to/item\".",
basename, gimp_filename_to_utf8 (proc->prog),
GIMP_OBJECT (proc)->name,
menu_path);
goto failure;
}
g_free (prefix);
g_free (basename);
proc->menu_paths = g_list_append (proc->menu_paths, g_strdup (menu_path));
......@@ -449,20 +440,25 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
failure:
if (required)
{
gchar *prefix = g_strdup (menu_path);
p = strchr (prefix, '>') + 1;
*p = '\0';
basename = g_filename_display_basename (proc->prog);
g_set_error (error, 0, 0,
"Plug-In \"%s\"\n(%s)\n\n"
"attempted to install %s procedure \"%s\" "
"which does not take the standard %s Plug-In "
"arguments.\n"
"(%s)",
"arguments: (%s).",
basename, gimp_filename_to_utf8 (proc->prog),
prefix, GIMP_OBJECT (proc)->name, prefix,
required);
g_free (prefix);
}
g_free (prefix);
g_free (basename);
return FALSE;
......
......@@ -1266,7 +1266,7 @@ PKG_CHECK_MODULES(URI_LIBCURL, $libcurl_modules,
have_libcurl=yes,
have_libcurl="no (libcurl not found)")
AM_CONDITIONAL(HAVE_LIBCURL, test x$have_libcurl = xyes)
AM_CONDITIONAL(HAVE_LIBCURL, test "x$have_libcurl" = xyes)
if test "x$have_gnomevfs" = xyes; then
uri_plugin="yes (using gnome-vfs)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment