anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more xforms configuration fixes; patch to read xpm files from herbert

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4380 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-06-12 12:54:06 +00:00
parent 373371c512
commit 42ff454d91
7 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-12 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): fix and simplify the
check for flimage.h header.
2002-06-07 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): test for jpeg library

14
config/xforms.m4
View File

@ -88,19 +88,7 @@ if test $lyx_use_xforms_image_loader = yes ; then
AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
[Define if you want to use xforms built-in image loader])
AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
AC_CHECK_HEADER(flimage.h,[
ac_cv_header_flimage_h=yes
lyx_cv_flimage_h_location="<flimage.h>"],
[AC_CHECK_HEADER(X11/flimage.h,[
ac_cv_header_flimage_h=yes
lyx_cv_flimage_h_location="<X11/flimage.h>"],
ac_cv_header_flimage_h=no)])
if test $ac_cv_header_flimage_h = yes ; then
AC_DEFINE(HAVE_FLIMAGE_H, 1, [Define if you have the <flimage.h> header file.])
AC_DEFINE_UNQUOTED(FLIMAGE_H_LOCATION, $lyx_cv_flimage_h_location,
[define this to the location of flimage.h to be used with #include, e.g. <flimage.h>
])
fi
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
fi
### If the gui cannot load images itself, then we default to the

4
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-12 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* xformsGImage.h: do not rely on FLIMAGE_H_LOCATION anymore
2002-06-07 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* xformsGImage.h: fix typo

7
src/frontends/xforms/xformsGImage.h
View File

@ -20,8 +20,13 @@
#include "graphics/GraphicsImage.h"
#include FORMS_H_LOCATION
#ifdef HAVE_FLIMAGE_H
#include FLIMAGE_H_LOCATION
# include <flimage.h>
#else
# ifdef HAVE_X11_FLIMAGE_H
# include <X11/flimage.h>
# endif
#endif
namespace grfx {

5
src/graphics/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-10 Herbert Voss <voss@lyx.org>
* GraphicsImageXPM.C (convertTo7chars): get another special color
format from convert work in the right way
2002-06-06 Angus Leeming <a.leeming@ic.ac.uk>
* GraphicsImageXPM.C (rotate): rotate in the same sense as xdvi!

5
src/graphics/GraphicsImageXPM.C
View File

@ -557,7 +557,7 @@ namespace {
string const convertTo7chars(string const & input)
{
string::size_type size = input.size();
if (size != 13 && size != 10 && size != 4)
if (size != 13 && size != 10 && size != 9 && size != 4)
// Can't deal with it.
return input;
@ -578,6 +578,9 @@ string const convertTo7chars(string const & input)
format.erase(5, 1);
format.erase(7, 1);
break;
case 9: //
format.erase(7);
break;
case 4: // #rgb
format.insert(2, 1, '0');
format.insert(4, 1, '0');

2
status.12x
View File

@ -60,6 +60,8 @@ What's new
- fix the default tgif format entry to use .obj as file extension and
not .tgif
- fix reading of xpm files produced by some versions of imagemagick
- fix interaction between sixpack and LyX via lyxserver
- fix command line crash and give useful exit status on some errors