Removing old defs. pnunn.
git-svn-id: svn://10.0.0.236/trunk@33022 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pnunn%netscape.com
parent
7d7ff977e0
commit
a4ee63dc0b
@ -18,7 +18,7 @@
|
||||
|
||||
/* -*- Mode: C; tab-width: 4 -*-
|
||||
* il_strm.h --- Stream converters for the image library.
|
||||
* $Id: il_strm.h,v 3.2 1998-07-27 16:09:06 hardts%netscape.com Exp $
|
||||
* $Id: il_strm.h,v 3.3 1999-05-27 22:37:43 pnunn%netscape.com Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -41,30 +41,4 @@
|
||||
#endif /* IL_INTERNAL */
|
||||
|
||||
|
||||
#ifndef STANDALONE_IMAGE_LIB
|
||||
XP_BEGIN_PROTOS
|
||||
|
||||
/********************** Image Library stream converters. *********************/
|
||||
extern int IL_DisplayMemCacheInfoAsHTML(FO_Present_Types format_out,
|
||||
URL_Struct *urls,
|
||||
OPAQUE_CONTEXT *net_cx);
|
||||
|
||||
/********************** Image Library stream converters. *********************/
|
||||
|
||||
/* The standard converter for all types of images which are part of an HTML
|
||||
document. */
|
||||
extern NET_StreamClass * IL_NewStream (FO_Present_Types format_out,
|
||||
void *data_obj,
|
||||
URL_Struct *urls,
|
||||
OPAQUE_CONTEXT *cx);
|
||||
|
||||
/* The converter used to handle images which are viewed by themselves e.g.
|
||||
http://home.netscape.com/foo.gif. This generates a fake
|
||||
HTML document, and ships it off to the parser. */
|
||||
extern NET_StreamClass * IL_ViewStream (FO_Present_Types format_out,
|
||||
void *data_obj,
|
||||
URL_Struct *urls,
|
||||
OPAQUE_CONTEXT *cx);
|
||||
XP_END_PROTOS
|
||||
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
/* -*- Mode: C; tab-width: 4 -*-
|
||||
* il_types.h --- Image library data types and structures.
|
||||
* $Id: il_types.h,v 3.2 1998-07-27 16:09:07 hardts%netscape.com Exp $
|
||||
* $Id: il_types.h,v 3.3 1999-05-27 22:38:37 pnunn%netscape.com Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -27,13 +27,8 @@
|
||||
|
||||
#include "prtypes.h"
|
||||
|
||||
#ifdef STANDALONE_IMAGE_LIB
|
||||
#define IL_EXTERN(__type) PR_EXTERN(__type)
|
||||
#define IL_IMPLEMENT(__type) PR_IMPLEMENT(__type)
|
||||
#else
|
||||
#define IL_EXTERN(__type) __type
|
||||
#define IL_IMPLEMENT(__type) __type
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
|
||||
/************************** Notes ********************************************
|
||||
* 1. Required #defines:
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
/* -*- Mode: C; tab-width: 4 -*-
|
||||
* libimg.h --- API calls to the Image Library.
|
||||
* $Id: libimg.h,v 3.2 1998-07-27 16:09:09 hardts%netscape.com Exp $
|
||||
* $Id: libimg.h,v 3.3 1999-05-27 22:39:08 pnunn%netscape.com Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -30,17 +30,8 @@
|
||||
|
||||
#include "dummy_nc.h"
|
||||
|
||||
#ifdef STANDALONE_IMAGE_LIB
|
||||
#include "ilISystemServices.h"
|
||||
#include "ilIImageRenderer.h"
|
||||
#else
|
||||
#include "MIMGCBIF.h" /* JMC generated callback interface. */
|
||||
#include "MIMGCB.h" /* JMC generated callback interface
|
||||
implementation. */
|
||||
#include "MPSIMGCB.h" /* JMC generated callback interface
|
||||
implementation for PostScript Front End. */
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
|
||||
|
||||
/*********************** Observers and Observables ***************************/
|
||||
|
||||
@ -63,13 +54,8 @@ PR_BEGIN_EXTERN_C
|
||||
- Initialize internal state.
|
||||
- Scan image plug-in directory.
|
||||
- Register individual image decoders with the netlib. */
|
||||
#ifdef STANDALONE_IMAGE_LIB
|
||||
IL_EXTERN(int)
|
||||
IL_Init(ilISystemServices *ss);
|
||||
#else
|
||||
IL_EXTERN(int)
|
||||
IL_Init(void);
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
|
||||
/* Used when exiting the client, this code frees all imagelib data structures.
|
||||
This is done for two reasons:
|
||||
@ -90,15 +76,9 @@ IL_Shutdown(void);
|
||||
|
||||
The display_context argument is opaque to the image library and is
|
||||
passed back to all of the callbacks in IMGCBIF interface. */
|
||||
#ifdef STANDALONE_IMAGE_LIB
|
||||
IL_EXTERN(IL_GroupContext *)
|
||||
IL_NewGroupContext(void *display_context,
|
||||
ilIImageRenderer *image_render);
|
||||
#else
|
||||
IL_EXTERN(IL_GroupContext *)
|
||||
IL_NewGroupContext(void *display_context,
|
||||
IMGCBIF *image_callbacks);
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
|
||||
/* Free an image context. IL_DestroyGroupContext will make a call
|
||||
to the IMGCBIF_Release callback function of the JMC interface prior to
|
||||
@ -317,13 +297,6 @@ IL_GetCacheSize(void);
|
||||
IL_EXTERN(char *)
|
||||
IL_HTMLImageInfo(char *url_address);
|
||||
|
||||
#ifndef STANDALONE_IMAGE_LIB
|
||||
/* Wacky netlib callback designed to give precedence to streams that block
|
||||
layout. */
|
||||
IL_EXTERN(PRBool)
|
||||
IL_PreferredStream(URL_Struct *urls);
|
||||
#endif
|
||||
|
||||
/* This is a legacy "safety-valve" routine, called each time a new HTML page
|
||||
is loaded. It causes remaining references to images in the given group
|
||||
context to be freed, i.e. like calling IL_DestroyImage on each of them.
|
||||
|
||||
@ -46,30 +46,9 @@ LCFLAGS = $(LCFLAGS) /TP
|
||||
|
||||
MODULE=img
|
||||
DEPTH=..\..\..
|
||||
!ifdef MOZ_JAVA
|
||||
!ifndef STANDALONE_IMAGE_LIB
|
||||
JMC_GEN=MIMGCBIF MIMGCB MPSIMGCB
|
||||
JMC_GEN_FLAGS=-cimpl -noexc -interface
|
||||
EXPORTS=il_types.h ni_pixmp.h libimg.h il_icons.h il_strm.h il_util.h \
|
||||
dummy_nc.h $(JMC_GEN_DIR)/MIMGCBIF.h $(JMC_GEN_DIR)/MIMGCB.h \
|
||||
$(JMC_GEN_DIR)/MPSIMGCB.h
|
||||
JMC_HEADERS=$(JMC_GEN_DIR)\MIMGCBIF.h $(JMC_GEN_DIR)\MIMGCB.h \
|
||||
$(JMC_GEN_DIR)\MPSIMGCB.h
|
||||
JMC_STUBS=$(JMC_GEN_DIR)\MIMGCBIF.c $(JMC_GEN_DIR)\MIMGCB.c \
|
||||
$(JMC_GEN_DIR)\MPSIMGCB.c
|
||||
JMC_OBJS=.\$(OBJDIR)\MIMGCBIF.obj .\$(OBJDIR)\MIMGCB.obj \
|
||||
.\$(OBJDIR)\MPSIMGCB.obj
|
||||
!endif
|
||||
!else
|
||||
!ifdef STANDALONE_IMAGE_LIB
|
||||
EXPORTS=il_types.h ni_pixmp.h libimg.h il_icons.h il_strm.h il_util.h \
|
||||
ilINetContext.h ilIURL.h ilINetReader.h ilIImageRenderer.h \
|
||||
ilISystemServices.h
|
||||
!else
|
||||
EXPORTS=il_types.h ni_pixmp.h libimg.h il_icons.h il_strm.h il_util.h \
|
||||
dummy_nc.h MIMGCBIF.h MIMGCB.h MPSIMGCB.h
|
||||
!endif
|
||||
!endif
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
@ -79,22 +58,5 @@ EXPORTS=il_types.h ni_pixmp.h libimg.h il_icons.h il_strm.h il_util.h \
|
||||
#//------------------------------------------------------------------------
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
!ifdef MOZ_JAVA
|
||||
!ifndef STANDALONE_IMAGE_LIB
|
||||
$(JMC_GEN_DIR)\MIMGCBIF.h: $(JMCSRCDIR)\IMGCBIF.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -interface $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
$(JMC_GEN_DIR)\MIMGCBIF.c: $(JMCSRCDIR)\IMGCBIF.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -module $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
$(JMC_GEN_DIR)\MIMGCB.h: $(JMCSRCDIR)\IMGCB.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -interface $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
$(JMC_GEN_DIR)\MIMGCB.c: $(JMCSRCDIR)\IMGCB.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -module $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
$(JMC_GEN_DIR)\MPSIMGCB.h: $(JMCSRCDIR)\PSIMGCB.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -interface $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
$(JMC_GEN_DIR)\MPSIMGCB.c: $(JMCSRCDIR)\PSIMGCB.class
|
||||
$(JMC) -d $(JMC_GEN_DIR) -module $(JMC_GEN_FLAGS) $(?F:.class=)
|
||||
!endif
|
||||
!endif
|
||||
|
||||
|
||||
export:: INSTALL_FILES
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
/* if.h --- Top-level image library internal routines
|
||||
*
|
||||
* $Id: if_struct.h,v 1.3 1999-04-20 19:30:33 pnunn%netscape.com Exp $
|
||||
* $Id: if_struct.h,v 1.4 1999-05-27 22:40:52 pnunn%netscape.com Exp $
|
||||
*/
|
||||
|
||||
#ifndef _if_h
|
||||
@ -42,10 +42,6 @@
|
||||
#include "ntypes.h" /* typedefs for commonly used Netscape data
|
||||
structures */
|
||||
|
||||
#ifndef STANDALONE_IMAGE_LIB
|
||||
#include "net.h"
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
|
||||
typedef struct _IL_GroupContext IL_GroupContext;
|
||||
typedef struct _IL_ImageReq IL_ImageReq;
|
||||
typedef struct il_context_list il_context_list;
|
||||
@ -61,20 +57,6 @@ typedef struct il_container_struct il_container;
|
||||
#include "ilINetReader.h"
|
||||
#include "ilIImageRenderer.h"
|
||||
|
||||
/***************************** also in dllcompat.h ***********************/
|
||||
#ifndef STANDALONE_IMAGE_LIB
|
||||
PR_BEGIN_EXTERN_C
|
||||
typedef void
|
||||
(*TimeoutCallbackFunction) (void * closure);
|
||||
|
||||
extern void *
|
||||
FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs);
|
||||
extern void
|
||||
FE_ClearTimeout(void *timer_id);
|
||||
PR_END_EXTERN_C
|
||||
#endif
|
||||
/********************************* in dllcompat.h *************************************/
|
||||
|
||||
#include "il.h"
|
||||
|
||||
/* For debugging counts of loading, looping and aborted images, needed for
|
||||
|
||||
@ -184,42 +184,22 @@ il_flush_image_data(il_container *ic)
|
||||
* it to the server.)
|
||||
*/
|
||||
for (;row < (end_row - row_interval); row += row_interval) {
|
||||
#ifdef STANDALONE_IMAGE_LIB
|
||||
img_cx->img_cb->UpdatePixmap(img_cx->dpy_cx, image, 0, row,
|
||||
img_header->width, row_interval);
|
||||
#else
|
||||
IMGCBIF_UpdatePixmap(img_cx->img_cb, img_cx->dpy_cx, image, 0, row,
|
||||
img_header->width, row_interval);
|
||||
#endif
|
||||
if (mask) {
|
||||
#ifdef STANDALONE_IMAGE_LIB
|
||||
img_cx->img_cb->UpdatePixmap(img_cx->dpy_cx, mask, 0, row,
|
||||
mask_header->width, row_interval);
|
||||
#else
|
||||
IMGCBIF_UpdatePixmap(img_cx->img_cb, img_cx->dpy_cx, mask, 0, row,
|
||||
mask_header->width, row_interval);
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
}
|
||||
}
|
||||
#endif /* XP_UNIX */
|
||||
|
||||
/* Draw whatever is leftover after sending the chunks */
|
||||
#ifdef STANDALONE_IMAGE_LIB
|
||||
img_cx->img_cb->UpdatePixmap(img_cx->dpy_cx, image,
|
||||
0, row, img_header->width, end_row - row + 1);
|
||||
#else
|
||||
IMGCBIF_UpdatePixmap(img_cx->img_cb, img_cx->dpy_cx, image, 0, row,
|
||||
img_header->width, end_row - row + 1);
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
|
||||
if (mask) {
|
||||
#ifdef STANDALONE_IMAGE_LIB
|
||||
img_cx->img_cb->UpdatePixmap(img_cx->dpy_cx, mask, 0, row,
|
||||
mask_header->width, end_row - row + 1);
|
||||
#else
|
||||
IMGCBIF_UpdatePixmap(img_cx->img_cb, img_cx->dpy_cx, mask, 0, row,
|
||||
mask_header->width, end_row - row + 1);
|
||||
#endif /* STANDALONE_IMAGE_LIB */
|
||||
}
|
||||
|
||||
/* Update the displayable area of the pixmap. */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user