|
 |
5506cea |
--- a/shell/Module_shell.mk 2013-02-13 15:48:02.880128705 +0000
|
|
|
5506cea |
+++ b/shell/Module_shell.mk 2013-02-13 16:37:33.766353120 +0000
|
|
|
5506cea |
@@ -32,14 +32,6 @@
|
|
|
5506cea |
Library_localebe \
|
|
|
5506cea |
))
|
|
|
5506cea |
|
|
|
5506cea |
-ifeq ($(OS),LINUX)
|
|
|
5506cea |
-ifeq ($(ENABLE_GIO),TRUE)
|
|
|
5506cea |
-$(eval $(call gb_Module_add_targets,shell,\
|
|
|
5506cea |
- Library_losessioninstall \
|
|
|
5506cea |
-))
|
|
|
5506cea |
-endif
|
|
|
5506cea |
-endif
|
|
|
5506cea |
-
|
|
|
5506cea |
ifeq ($(ENABLE_GCONF),TRUE)
|
|
|
5506cea |
$(eval $(call gb_Module_add_targets,shell,\
|
|
|
5506cea |
Library_gconfbe \
|
|
|
6b7a722 |
diff --git a/Repository.mk b/Repository.mk
|
|
|
6b7a722 |
index d0de1d8..526fea3 100644
|
|
|
6b7a722 |
--- a/Repository.mk
|
|
|
6b7a722 |
+++ b/Repository.mk
|
|
|
6b7a722 |
@@ -229,7 +229,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
|
|
|
6b7a722 |
$(if $(ENABLE_GTK3),vclplug_gtk3) \
|
|
|
6b7a722 |
$(if $(ENABLE_GCONF),gconfbe1) \
|
|
|
6b7a722 |
$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
|
|
|
6b7a722 |
- $(if $(ENABLE_GIO),losessioninstall) \
|
|
|
6b7a722 |
$(if $(ENABLE_GIO),ucpgio1) \
|
|
|
6b7a722 |
$(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
|
|
|
6b7a722 |
))
|
|
|
6b7a722 |
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
|
|
|
6b7a722 |
index 936aac2..7d26eb4 100644
|
|
|
6b7a722 |
--- a/postprocess/Rdb_services.mk
|
|
|
6b7a722 |
+++ b/postprocess/Rdb_services.mk
|
|
|
6b7a722 |
@@ -197,7 +197,6 @@ $(eval $(call gb_Rdb_add_components,services,\
|
|
|
6b7a722 |
shell/source/backends/gconfbe/gconfbe1 \
|
|
|
6b7a722 |
) \
|
|
|
6b7a722 |
$(if $(ENABLE_GIO), \
|
|
|
6b7a722 |
- shell/source/sessioninstall/losessioninstall \
|
|
|
6b7a722 |
ucb/source/ucp/gio/ucpgio \
|
|
|
6b7a722 |
) \
|
|
|
6b7a722 |
$(if $(ENABLE_GNOMEVFS), \
|
|
|
a57f408 |
diff --git a/configure.ac b/configure.ac
|
|
|
a57f408 |
index 059188f..23503da 100644
|
|
|
a57f408 |
--- a/configure.ac
|
|
|
a57f408 |
+++ b/configure.ac
|
|
|
a57f408 |
@@ -7113,17 +7113,6 @@ if test "$with_system_jpeg" = "yes"; then
|
|
|
a57f408 |
[AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
|
|
|
a57f408 |
AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
|
|
|
a57f408 |
[AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
|
|
|
a57f408 |
- AC_MSG_CHECKING([[libjpeg supports JERR_BAD_CROP_SPEC (jpeg-7 API)]])
|
|
|
a57f408 |
- AC_COMPILE_IFELSE([ AC_LANG_SOURCE(
|
|
|
a57f408 |
- [[
|
|
|
a57f408 |
-#include <stdio.h>
|
|
|
a57f408 |
-#include <jerror.h>
|
|
|
a57f408 |
-int main(int c, char**v) { printf("%d\n", JERR_BAD_CROP_SPEC); return 0; }
|
|
|
a57f408 |
- ]]) ],
|
|
|
a57f408 |
- [AC_MSG_RESULT(yes)],
|
|
|
a57f408 |
- [AC_MSG_RESULT(no)
|
|
|
a57f408 |
- AC_MSG_ERROR(jpeg library version >= 7 or jpeg-turbo version >= 1.1 required)
|
|
|
a57f408 |
- ])
|
|
|
a57f408 |
libo_MINGW_CHECK_DLL([libjpeg])
|
|
|
a57f408 |
else
|
|
|
a57f408 |
AC_MSG_RESULT([internal])
|
|
|
a57f408 |
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
|
|
|
a57f408 |
index 33da623..4cae59e 100644
|
|
|
a57f408 |
--- a/vcl/source/filter/jpeg/transupp.c
|
|
|
a57f408 |
+++ b/vcl/source/filter/jpeg/transupp.c
|
|
|
a57f408 |
@@ -1006,7 +1006,7 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
|
|
|
a57f408 |
info->crop_yoffset = 0; /* default to +0 */
|
|
|
a57f408 |
if (info->crop_xoffset >= info->output_width ||
|
|
|
a57f408 |
info->crop_yoffset >= info->output_height)
|
|
|
a57f408 |
- ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
|
|
|
a57f408 |
+ ERREXIT(srcinfo, JERR_CONVERSION_NOTIMPL);
|
|
|
a57f408 |
if (info->crop_width_set == JCROP_UNSET)
|
|
|
a57f408 |
info->crop_width = info->output_width - info->crop_xoffset;
|
|
|
a57f408 |
if (info->crop_height_set == JCROP_UNSET)
|
|
|
a57f408 |
@@ -1016,7 +1016,7 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
|
|
|
a57f408 |
info->crop_height <= 0 || info->crop_height > info->output_height ||
|
|
|
a57f408 |
info->crop_xoffset > info->output_width - info->crop_width ||
|
|
|
a57f408 |
info->crop_yoffset > info->output_height - info->crop_height)
|
|
|
a57f408 |
- ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
|
|
|
a57f408 |
+ ERREXIT(srcinfo, JERR_CONVERSION_NOTIMPL);
|
|
|
a57f408 |
/* Convert negative crop offsets into regular offsets */
|
|
|
a57f408 |
if (info->crop_xoffset_set == JCROP_NEG)
|
|
|
a57f408 |
xoffset = info->output_width - info->crop_width - info->crop_xoffset;
|