projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Fsave_charset_mapping_table): Open database as "w+" mode.
[chise/xemacs-chise.git-]
/
src
/
glyphs-eimage.c
diff --git
a/src/glyphs-eimage.c
b/src/glyphs-eimage.c
index
928b8e6
..
f8502d1
100644
(file)
--- a/
src/glyphs-eimage.c
+++ b/
src/glyphs-eimage.c
@@
-56,6
+56,7
@@
Boston, MA 02111-1307, USA. */
#include "buffer.h"
#include "frame.h"
#include "opaque.h"
#include "buffer.h"
#include "frame.h"
#include "opaque.h"
+#include "window.h"
#include "sysfile.h"
#include "sysfile.h"
@@
-118,7
+119,8
@@
jpeg_validate (Lisp_Object instantiator)
}
static Lisp_Object
}
static Lisp_Object
-jpeg_normalize (Lisp_Object inst, Lisp_Object console_type)
+jpeg_normalize (Lisp_Object inst, Lisp_Object console_type,
+ Lisp_Object dest_mask)
{
return simple_image_type_normalize (inst, console_type, Qjpeg);
}
{
return simple_image_type_normalize (inst, console_type, Qjpeg);
}
@@
-480,7
+482,7
@@
jpeg_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
/* Step 6.5: Create the pixmap and set up the image instance */
/* now instantiate */
/* Step 6.5: Create the pixmap and set up the image instance */
/* now instantiate */
- MAYBE_DEVMETH (XDEVICE (ii->device),
+ MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain),
init_image_instance_from_eimage,
(ii, cinfo.output_width, cinfo.output_height, 1,
unwind.eimage, dest_mask,
init_image_instance_from_eimage,
(ii, cinfo.output_width, cinfo.output_height, 1,
unwind.eimage, dest_mask,
@@
-514,7
+516,8
@@
gif_validate (Lisp_Object instantiator)
}
static Lisp_Object
}
static Lisp_Object
-gif_normalize (Lisp_Object inst, Lisp_Object console_type)
+gif_normalize (Lisp_Object inst, Lisp_Object console_type,
+ Lisp_Object dest_mask)
{
return simple_image_type_normalize (inst, console_type, Qgif);
}
{
return simple_image_type_normalize (inst, console_type, Qgif);
}
@@
-706,7
+709,7
@@
gif_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
}
/* now instantiate */
}
/* now instantiate */
- MAYBE_DEVMETH (XDEVICE (ii->device),
+ MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain),
init_image_instance_from_eimage,
(ii, width, height, unwind.giffile->ImageCount, unwind.eimage, dest_mask,
instantiator, domain));
init_image_instance_from_eimage,
(ii, width, height, unwind.giffile->ImageCount, unwind.eimage, dest_mask,
instantiator, domain));
@@
-756,7
+759,8
@@
png_validate (Lisp_Object instantiator)
}
static Lisp_Object
}
static Lisp_Object
-png_normalize (Lisp_Object inst, Lisp_Object console_type)
+png_normalize (Lisp_Object inst, Lisp_Object console_type,
+ Lisp_Object dest_mask)
{
return simple_image_type_normalize (inst, console_type, Qpng);
}
{
return simple_image_type_normalize (inst, console_type, Qpng);
}
@@
-1017,7
+1021,7
@@
png_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
}
/* now instantiate */
}
/* now instantiate */
- MAYBE_DEVMETH (XDEVICE (ii->device),
+ MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain),
init_image_instance_from_eimage,
(ii, width, height, 1, unwind.eimage, dest_mask,
instantiator, domain));
init_image_instance_from_eimage,
(ii, width, height, 1, unwind.eimage, dest_mask,
instantiator, domain));
@@
-1042,7
+1046,8
@@
tiff_validate (Lisp_Object instantiator)
}
static Lisp_Object
}
static Lisp_Object
-tiff_normalize (Lisp_Object inst, Lisp_Object console_type)
+tiff_normalize (Lisp_Object inst, Lisp_Object console_type,
+ Lisp_Object dest_mask)
{
return simple_image_type_normalize (inst, console_type, Qtiff);
}
{
return simple_image_type_normalize (inst, console_type, Qtiff);
}
@@
-1254,7
+1259,7
@@
tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
mem_struct.len = len;
mem_struct.index = 0;
mem_struct.len = len;
mem_struct.index = 0;
- unwind.tiff = TIFFClientOpen ("memfile", "r", &mem_struct,
+ unwind.tiff = TIFFClientOpen ("memfile", "r", (thandle_t) &mem_struct,
(TIFFReadWriteProc)tiff_memory_read,
(TIFFReadWriteProc)tiff_memory_write,
tiff_memory_seek, tiff_memory_close, tiff_memory_size,
(TIFFReadWriteProc)tiff_memory_read,
(TIFFReadWriteProc)tiff_memory_write,
tiff_memory_seek, tiff_memory_close, tiff_memory_size,
@@
-1299,7
+1304,7
@@
tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
}
/* now instantiate */
}
/* now instantiate */
- MAYBE_DEVMETH (XDEVICE (ii->device),
+ MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain),
init_image_instance_from_eimage,
(ii, width, height, 1, unwind.eimage, dest_mask,
instantiator, domain));
init_image_instance_from_eimage,
(ii, width, height, 1, unwind.eimage, dest_mask,
instantiator, domain));