mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-15 04:32:24 +00:00
libdthelp: Resolve 65 -Wunused-variable warnings
This commit is contained in:
parent
6f2a704bbd
commit
21feacd159
27 changed files with 16 additions and 59 deletions
|
@ -1722,7 +1722,6 @@ _DtCvDrawSegments(
|
||||||
short image_offset = _DtCvFALSE;
|
short image_offset = _DtCvFALSE;
|
||||||
_DtCvUnit segWidth;
|
_DtCvUnit segWidth;
|
||||||
_DtCvUnit yPos;
|
_DtCvUnit yPos;
|
||||||
_DtCvValue junk;
|
|
||||||
void *pChar;
|
void *pChar;
|
||||||
_DtCvFlags saveEnd = new_flag &
|
_DtCvFlags saveEnd = new_flag &
|
||||||
(_DtCvTRAVERSAL_END | _DtCvLINK_END | _DtCvMARK_END);
|
(_DtCvTRAVERSAL_END | _DtCvLINK_END | _DtCvMARK_END);
|
||||||
|
|
|
@ -152,7 +152,6 @@ _DtHelpFreeSegments (
|
||||||
_DtCvSegment *topSeg = NULL;
|
_DtCvSegment *topSeg = NULL;
|
||||||
_DtCvSegment *topTab = NULL;
|
_DtCvSegment *topTab = NULL;
|
||||||
_DtCvSegment **tableSeg;
|
_DtCvSegment **tableSeg;
|
||||||
_DtHelpDARegion *pReg;
|
|
||||||
|
|
||||||
while (seg_list != NULL)
|
while (seg_list != NULL)
|
||||||
{
|
{
|
||||||
|
|
|
@ -89,7 +89,6 @@ _DtCvStrLen (
|
||||||
int type )
|
int type )
|
||||||
{
|
{
|
||||||
int len = 0;
|
int len = 0;
|
||||||
const char *s1;
|
|
||||||
const wchar_t *wcs;
|
const wchar_t *wcs;
|
||||||
|
|
||||||
if (0 == type)
|
if (0 == type)
|
||||||
|
|
|
@ -81,7 +81,6 @@ const char * _DtHelpFileSuffixList[3] = {
|
||||||
NULL };
|
NULL };
|
||||||
|
|
||||||
/******** variables *********/
|
/******** variables *********/
|
||||||
static const char * EmptyStr = "";
|
|
||||||
#ifdef not_used
|
#ifdef not_used
|
||||||
static const char * PeriodStr = ".";
|
static const char * PeriodStr = ".";
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -4072,7 +4072,6 @@ Format(
|
||||||
char *id_string,
|
char *id_string,
|
||||||
_DtCvTopicPtr *ret_topic )
|
_DtCvTopicPtr *ret_topic )
|
||||||
{
|
{
|
||||||
int cnt;
|
|
||||||
int result = 0;
|
int result = 0;
|
||||||
int done = 0;
|
int done = 0;
|
||||||
char *charSet = NULL;
|
char *charSet = NULL;
|
||||||
|
|
|
@ -4420,7 +4420,6 @@ CompressLinkSeg(
|
||||||
_DtCvSegment *p_seg)
|
_DtCvSegment *p_seg)
|
||||||
{
|
{
|
||||||
void *pChar;
|
void *pChar;
|
||||||
wchar_t fChar;
|
|
||||||
int wcFlag;
|
int wcFlag;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -4461,7 +4460,6 @@ CompressLinkSeg(
|
||||||
strmove(((char *)pChar), &(((char *)pChar)[1]));
|
strmove(((char *)pChar), &(((char *)pChar)[1]));
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
wchar_t *wcChar = (wchar_t *) pChar;
|
wchar_t *wcChar = (wchar_t *) pChar;
|
||||||
|
|
||||||
while (0 != wcChar[0])
|
while (0 != wcChar[0])
|
||||||
|
@ -10106,7 +10104,6 @@ _DtHelpCeFrmtSDLVolTitleToAscii(
|
||||||
{
|
{
|
||||||
char *abbrev = NULL;
|
char *abbrev = NULL;
|
||||||
int result = 0;
|
int result = 0;
|
||||||
int done = 0;
|
|
||||||
_DtCvSegment *pHeadSeg;
|
_DtCvSegment *pHeadSeg;
|
||||||
_DtHelpCeLockInfo lockInfo;
|
_DtHelpCeLockInfo lockInfo;
|
||||||
|
|
||||||
|
|
|
@ -356,7 +356,6 @@ TermStrDraw (
|
||||||
mbstowcs(&wcStr[x], string, byte_len);
|
mbstowcs(&wcStr[x], string, byte_len);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
wchar_t *wcp = (wchar_t *) string;
|
wchar_t *wcp = (wchar_t *) string;
|
||||||
|
|
||||||
while (0 < byte_len)
|
while (0 < byte_len)
|
||||||
|
|
|
@ -1040,6 +1040,7 @@ static int dither_8X8[8][8] =
|
||||||
//};
|
//};
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
static int dither_4X4[4][4] =
|
static int dither_4X4[4][4] =
|
||||||
{
|
{
|
||||||
{ 0, 8, 2, 10 },
|
{ 0, 8, 2, 10 },
|
||||||
|
@ -1062,6 +1063,7 @@ static int dither_2X2[2][2] =
|
||||||
{ 0, 2 },
|
{ 0, 2 },
|
||||||
{ 3, 1}
|
{ 3, 1}
|
||||||
};
|
};
|
||||||
|
*/
|
||||||
|
|
||||||
/*static int dither_matrix_sz = 2; */
|
/*static int dither_matrix_sz = 2; */
|
||||||
/*static int dither_matrix_sz = 4; */
|
/*static int dither_matrix_sz = 4; */
|
||||||
|
|
|
@ -750,7 +750,6 @@ static int HitTopicsDisplay (
|
||||||
{
|
{
|
||||||
XmString * pTopicString;
|
XmString * pTopicString;
|
||||||
XmString prefixString;
|
XmString prefixString;
|
||||||
XmString labelString;
|
|
||||||
XmString *items;
|
XmString *items;
|
||||||
char * tmpStr;
|
char * tmpStr;
|
||||||
int i;
|
int i;
|
||||||
|
@ -4922,10 +4921,12 @@ void _DtHelpGlobSrchDisplayDialog(
|
||||||
DtHelpDialogWidget hw = (DtHelpDialogWidget) w;
|
DtHelpDialogWidget hw = (DtHelpDialogWidget) w;
|
||||||
XmToggleButtonCallbackStruct status; /* the call data */
|
XmToggleButtonCallbackStruct status; /* the call data */
|
||||||
Widget sourceBtn; /* widget owning event */
|
Widget sourceBtn; /* widget owning event */
|
||||||
|
#if 0
|
||||||
Dimension height;
|
Dimension height;
|
||||||
Dimension width;
|
Dimension width;
|
||||||
XmString labelString = NULL;
|
|
||||||
int n;
|
int n;
|
||||||
|
#endif
|
||||||
|
XmString labelString = NULL;
|
||||||
Arg args[10];
|
Arg args[10];
|
||||||
|
|
||||||
/* make the dialog itself */
|
/* make the dialog itself */
|
||||||
|
|
|
@ -1796,10 +1796,8 @@ static enum _DtGrLoadStatus processXpm(
|
||||||
int i, j;
|
int i, j;
|
||||||
int result;
|
int result;
|
||||||
short done;
|
short done;
|
||||||
Pixmap pixmap = 0;
|
|
||||||
XpmAttributes xpmAttr;
|
XpmAttributes xpmAttr;
|
||||||
Visual vis2;
|
Visual vis2;
|
||||||
XGCValues gcvalues;
|
|
||||||
float ratio = 1.0;
|
float ratio = 1.0;
|
||||||
|
|
||||||
enum _DtGrLoadStatus status = _DtGrSUCCESS;
|
enum _DtGrLoadStatus status = _DtGrSUCCESS;
|
||||||
|
@ -2384,7 +2382,6 @@ _DtHelpProcessGraphic(
|
||||||
unsigned int pixWidth = 0;
|
unsigned int pixWidth = 0;
|
||||||
unsigned int pixHeight = 0;
|
unsigned int pixHeight = 0;
|
||||||
Dimension pWidth, pHeight;
|
Dimension pWidth, pHeight;
|
||||||
char *ptr;
|
|
||||||
Pixmap pix = 0, mask = 0;
|
Pixmap pix = 0, mask = 0;
|
||||||
_DtGrStream stream;
|
_DtGrStream stream;
|
||||||
Screen *scrptr = ScreenOfDisplay (dpy, screen);
|
Screen *scrptr = ScreenOfDisplay (dpy, screen);
|
||||||
|
@ -2874,7 +2871,6 @@ size_t _DtGrRead(
|
||||||
size_t num_items,
|
size_t num_items,
|
||||||
_DtGrStream *stream)
|
_DtGrStream *stream)
|
||||||
{
|
{
|
||||||
size_t num_items_read;
|
|
||||||
unsigned nleft;
|
unsigned nleft;
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
|
|
|
@ -2121,7 +2121,6 @@ void _DtHelpUpdateDisplayArea(
|
||||||
char *userErrorStr=NULL;
|
char *userErrorStr=NULL;
|
||||||
char *sysErrorStr=NULL;
|
char *sysErrorStr=NULL;
|
||||||
char *tmpMsg=NULL;
|
char *tmpMsg=NULL;
|
||||||
char *retTitle;
|
|
||||||
XmString labelString;
|
XmString labelString;
|
||||||
Arg args[10];
|
Arg args[10];
|
||||||
int n=0;
|
int n=0;
|
||||||
|
|
|
@ -196,7 +196,6 @@ static void InitialPopupCB(
|
||||||
|
|
||||||
|
|
||||||
/* Static variables */
|
/* Static variables */
|
||||||
static char helpOnHelp[] = "Help4Help";
|
|
||||||
|
|
||||||
|
|
||||||
/* Supported resources for the HelpQuickDialog Widget */
|
/* Supported resources for the HelpQuickDialog Widget */
|
||||||
|
|
|
@ -123,7 +123,7 @@ static void CloseDefBoxCB(
|
||||||
#define HUSET 8 /* message catalog set */
|
#define HUSET 8 /* message catalog set */
|
||||||
|
|
||||||
/******** static variables ********/
|
/******** static variables ********/
|
||||||
static char DirSlash[] = "/";
|
|
||||||
|
|
||||||
/******** data structures ********/
|
/******** data structures ********/
|
||||||
typedef struct ExecContext
|
typedef struct ExecContext
|
||||||
|
@ -865,7 +865,6 @@ int _DtHelpFilterExecCmd(
|
||||||
XmString labelString2;
|
XmString labelString2;
|
||||||
Widget noexecBtn;
|
Widget noexecBtn;
|
||||||
Widget execBtn;
|
Widget execBtn;
|
||||||
Cursor cursor;
|
|
||||||
|
|
||||||
goodCmd = _DtHelpFilterExecCmdStr(helpWidget, executionPolicy,
|
goodCmd = _DtHelpFilterExecCmdStr(helpWidget, executionPolicy,
|
||||||
commandStr, &filteredCmdStr, &invalidAlias,
|
commandStr, &filteredCmdStr, &invalidAlias,
|
||||||
|
@ -1003,7 +1002,6 @@ void _DtHelpExecFilteredCmd(
|
||||||
Boolean queryNeeded;
|
Boolean queryNeeded;
|
||||||
char * filteredCmdStr = NULL;
|
char * filteredCmdStr = NULL;
|
||||||
ExecContext * execContext;
|
ExecContext * execContext;
|
||||||
DtHelpListStruct *pHelpInfo;
|
|
||||||
XmString labelString;
|
XmString labelString;
|
||||||
XmString labelString2;
|
XmString labelString2;
|
||||||
Widget msgDlg;
|
Widget msgDlg;
|
||||||
|
@ -1023,7 +1021,9 @@ void _DtHelpExecFilteredCmd(
|
||||||
following code can fail on IBM platform when XTHREADS and XUSE_MTSAFE_API
|
following code can fail on IBM platform when XTHREADS and XUSE_MTSAFE_API
|
||||||
are defined.
|
are defined.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
_Xgetpwparams pwd_buf;
|
_Xgetpwparams pwd_buf;
|
||||||
|
*/
|
||||||
struct passwd * pwd_ret;
|
struct passwd * pwd_ret;
|
||||||
|
|
||||||
/** -------------------------------------------------------------- *
|
/** -------------------------------------------------------------- *
|
||||||
|
|
|
@ -180,7 +180,6 @@ GetNoEnterCursor(
|
||||||
Pixmap pixmap;
|
Pixmap pixmap;
|
||||||
Pixmap maskPixmap;
|
Pixmap maskPixmap;
|
||||||
XColor xcolors[2];
|
XColor xcolors[2];
|
||||||
int scr;
|
|
||||||
unsigned int cWidth;
|
unsigned int cWidth;
|
||||||
unsigned int cHeight;
|
unsigned int cHeight;
|
||||||
int useLargeCursors = 0;
|
int useLargeCursors = 0;
|
||||||
|
@ -284,7 +283,6 @@ _DtHelpGetHourGlassCursor(
|
||||||
Pixmap pixmap;
|
Pixmap pixmap;
|
||||||
Pixmap maskPixmap;
|
Pixmap maskPixmap;
|
||||||
XColor xcolors[2];
|
XColor xcolors[2];
|
||||||
int scr;
|
|
||||||
unsigned int cWidth;
|
unsigned int cWidth;
|
||||||
unsigned int cHeight;
|
unsigned int cHeight;
|
||||||
int useLargeCursors = 0;
|
int useLargeCursors = 0;
|
||||||
|
|
|
@ -137,13 +137,15 @@ static void my_error_exit (j_common_ptr cinfo)
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
static void my_output_message (j_common_ptr cinfo)
|
static void my_output_message (j_common_ptr cinfo)
|
||||||
{
|
{
|
||||||
char buffer[JMSG_LENGTH_MAX];
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Uncommenting the lines below will cause error and warning messages
|
** Uncommenting the lines below will cause error and warning messages
|
||||||
** from the JPEG library to be displayed to stderr instead of suppressed
|
** from the JPEG library to be displayed to stderr instead of suppressed
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
** char buffer[JMSG_LENGTH_MAX];
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Create the message
|
** Create the message
|
||||||
**
|
**
|
||||||
|
@ -169,7 +171,7 @@ static void my_output_message (j_common_ptr cinfo)
|
||||||
static void init_source (
|
static void init_source (
|
||||||
j_decompress_ptr cinfo)
|
j_decompress_ptr cinfo)
|
||||||
{
|
{
|
||||||
stream_src_ptr src = (stream_src_ptr) cinfo->src;
|
/* stream_src_ptr src = (stream_src_ptr) cinfo->src; */
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
|
|
|
@ -2121,7 +2121,6 @@ ProcessTable(
|
||||||
int saveTravCnt = canvas->trav_cnt;
|
int saveTravCnt = canvas->trav_cnt;
|
||||||
_DtCvUnit workWidth;
|
_DtCvUnit workWidth;
|
||||||
_DtCvUnit newLeft;
|
_DtCvUnit newLeft;
|
||||||
_DtCvUnit rightMargin = 0;
|
|
||||||
_DtCvUnit saveLeft = layout->left;
|
_DtCvUnit saveLeft = layout->left;
|
||||||
_DtCvUnit saveYpos = layout->info.y_pos;
|
_DtCvUnit saveYpos = layout->info.y_pos;
|
||||||
_DtCvUnit tableYpos;
|
_DtCvUnit tableYpos;
|
||||||
|
@ -2141,7 +2140,6 @@ ProcessTable(
|
||||||
_DtCvFrmtOption *colJustSpec;
|
_DtCvFrmtOption *colJustSpec;
|
||||||
|
|
||||||
_DtCvValue oldFound = layout->id_found;
|
_DtCvValue oldFound = layout->id_found;
|
||||||
_DtCvValue haveHeads = False;
|
|
||||||
_DtCvValue haveBrds = False;
|
_DtCvValue haveBrds = False;
|
||||||
_DtCvValue saveState = layout->table_flag;
|
_DtCvValue saveState = layout->table_flag;
|
||||||
_DtCvValue saveAlignFlag = layout->info.align_flag;
|
_DtCvValue saveAlignFlag = layout->info.align_flag;
|
||||||
|
@ -3187,7 +3185,6 @@ ProcessController(
|
||||||
int saveTravCnt = canvas->trav_cnt;
|
int saveTravCnt = canvas->trav_cnt;
|
||||||
_DtCvUnit saveYPos = layout->info.y_pos;
|
_DtCvUnit saveYPos = layout->info.y_pos;
|
||||||
_DtCvUnit saveMaxWidth = layout->max_width;
|
_DtCvUnit saveMaxWidth = layout->max_width;
|
||||||
_DtCvUnit saveY = layout->info.y_pos;
|
|
||||||
_DtCvUnit saveLeft = layout->left;
|
_DtCvUnit saveLeft = layout->left;
|
||||||
_DtCvUnit saveRight = layout->right;
|
_DtCvUnit saveRight = layout->right;
|
||||||
_DtCvUnit maxWidth;
|
_DtCvUnit maxWidth;
|
||||||
|
@ -3742,10 +3739,6 @@ ProcessContainer(
|
||||||
int *ret_cnt)
|
int *ret_cnt)
|
||||||
{
|
{
|
||||||
int getLn;
|
int getLn;
|
||||||
int saveTravCnt = canvas->trav_cnt;
|
|
||||||
int saveLnCnt = canvas->line_cnt;
|
|
||||||
int saveTxtCnt = canvas->txt_cnt;
|
|
||||||
int joinLine = layout->info.join_line;
|
|
||||||
const char *saveJustifyChar = layout->info.align_char;
|
const char *saveJustifyChar = layout->info.align_char;
|
||||||
_DtCvUnit yPad = 0;
|
_DtCvUnit yPad = 0;
|
||||||
_DtCvUnit xPad = 0;
|
_DtCvUnit xPad = 0;
|
||||||
|
@ -3758,9 +3751,6 @@ ProcessContainer(
|
||||||
_DtCvUnit saveFirst = layout->first;
|
_DtCvUnit saveFirst = layout->first;
|
||||||
_DtCvUnit saveYpos = layout->info.y_pos;
|
_DtCvUnit saveYpos = layout->info.y_pos;
|
||||||
_DtCvValue saveStatic = layout->stat_flag;
|
_DtCvValue saveStatic = layout->stat_flag;
|
||||||
_DtCvValue botBrdr = False;
|
|
||||||
_DtCvValue rightBrdr = False;
|
|
||||||
_DtCvValue joinFlag = layout->info.join;
|
|
||||||
_DtCvValue saveBrdr = layout->brdr_flag;
|
_DtCvValue saveBrdr = layout->brdr_flag;
|
||||||
_DtCvFrmtOption saveJustify = layout->txt_justify;
|
_DtCvFrmtOption saveJustify = layout->txt_justify;
|
||||||
LayFrmtInfo frmtInfo;
|
LayFrmtInfo frmtInfo;
|
||||||
|
@ -5093,14 +5083,10 @@ CheckMoveInfo (
|
||||||
LayoutInfo *layout)
|
LayoutInfo *layout)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int txt_idx;
|
|
||||||
int ln_idx;
|
|
||||||
_DtCvUnit topY;
|
_DtCvUnit topY;
|
||||||
_DtCvUnit botY;
|
_DtCvUnit botY;
|
||||||
_DtCvUnit space;
|
|
||||||
_DtCvUnit maxWidth = canvas->metrics.width;
|
_DtCvUnit maxWidth = canvas->metrics.width;
|
||||||
GrpInfo *nxtGrp;
|
GrpInfo *nxtGrp;
|
||||||
GrpInfo *grp;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* fill in the max x of each group
|
* fill in the max x of each group
|
||||||
|
@ -5542,8 +5528,6 @@ _DtCanvasResize (
|
||||||
_DtCvStatus selectStatus;
|
_DtCvStatus selectStatus;
|
||||||
_DtCvStatus retStatus = _DtCvSTATUS_NONE;
|
_DtCvStatus retStatus = _DtCvSTATUS_NONE;
|
||||||
_DtCanvasStruct *canvas = (_DtCanvasStruct *) canvas_handle;
|
_DtCanvasStruct *canvas = (_DtCanvasStruct *) canvas_handle;
|
||||||
_DtCvSpaceMetrics oldLink = canvas->link_info;
|
|
||||||
_DtCvSpaceMetrics oldTrav = canvas->traversal_info;
|
|
||||||
_DtCvUnit oldWidth = canvas->metrics.width;
|
_DtCvUnit oldWidth = canvas->metrics.width;
|
||||||
LayoutInfo layOut;
|
LayoutInfo layOut;
|
||||||
_DtCvPointInfo selPt;
|
_DtCvPointInfo selPt;
|
||||||
|
@ -5650,7 +5634,6 @@ _DtCanvasSetTopic (
|
||||||
_DtCvUnit *ret_height,
|
_DtCvUnit *ret_height,
|
||||||
_DtCvUnit *ret_y )
|
_DtCvUnit *ret_y )
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
_DtCvStatus result = _DtCvSTATUS_OK;
|
_DtCvStatus result = _DtCvSTATUS_OK;
|
||||||
_DtCanvasStruct *canvas = (_DtCanvasStruct *) canvas_handle;
|
_DtCanvasStruct *canvas = (_DtCanvasStruct *) canvas_handle;
|
||||||
LayoutInfo layOut;
|
LayoutInfo layOut;
|
||||||
|
|
|
@ -1996,7 +1996,6 @@ _DtCvCvtSegsToPts (
|
||||||
_DtCvSegmentI *saveSeg;
|
_DtCvSegmentI *saveSeg;
|
||||||
_DtCvSegmentI **retSeg;
|
_DtCvSegmentI **retSeg;
|
||||||
_DtCvDspLine *lines = canvas->txt_lst;
|
_DtCvDspLine *lines = canvas->txt_lst;
|
||||||
_DtCvFlags flag;
|
|
||||||
_DtCvFlags result = _DtCvSTATUS_NONE;
|
_DtCvFlags result = _DtCvSTATUS_NONE;
|
||||||
_DtCvSelectData *tmpBeg;
|
_DtCvSelectData *tmpBeg;
|
||||||
_DtCvSelectData *tmpEnd;
|
_DtCvSelectData *tmpEnd;
|
||||||
|
|
|
@ -97,8 +97,6 @@ _DtHelpResizeDisplayArea (
|
||||||
Dimension tstHeight;
|
Dimension tstHeight;
|
||||||
Dimension oldWidth;
|
Dimension oldWidth;
|
||||||
Dimension oldHeight;
|
Dimension oldHeight;
|
||||||
XEvent event;
|
|
||||||
XmDrawnButtonCallbackStruct callBack;
|
|
||||||
DtHelpDispAreaStruct *pDAS = (DtHelpDispAreaStruct *) client_data;
|
DtHelpDispAreaStruct *pDAS = (DtHelpDispAreaStruct *) client_data;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -571,7 +571,6 @@ BuildLine(
|
||||||
_DtCvPointer *ret_data)
|
_DtCvPointer *ret_data)
|
||||||
{
|
{
|
||||||
_DtCvUnit topY;
|
_DtCvUnit topY;
|
||||||
_DtCvUnit lastY;
|
|
||||||
_DtCvDspLine *lines = canvas->txt_lst;
|
_DtCvDspLine *lines = canvas->txt_lst;
|
||||||
_DtCvStringInfo strInfo = { NULL, 0, 1, NULL };
|
_DtCvStringInfo strInfo = { NULL, 0, 1, NULL };
|
||||||
|
|
||||||
|
@ -691,7 +690,6 @@ GetSelectedText(
|
||||||
{
|
{
|
||||||
_DtCvUnit maxY;
|
_DtCvUnit maxY;
|
||||||
_DtCvUnit botY;
|
_DtCvUnit botY;
|
||||||
_DtCvUnit lastY;
|
|
||||||
int i;
|
int i;
|
||||||
int lineCnt = 0;
|
int lineCnt = 0;
|
||||||
int junk;
|
int junk;
|
||||||
|
@ -1332,7 +1330,6 @@ _DtCanvasProcessSelection (
|
||||||
_DtCvUnit y,
|
_DtCvUnit y,
|
||||||
_DtCvSelectMode mode)
|
_DtCvSelectMode mode)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
_DtCanvasStruct *canvas = (_DtCanvasStruct *) canvas_handle;
|
_DtCanvasStruct *canvas = (_DtCanvasStruct *) canvas_handle;
|
||||||
_DtCvSelectData temp;
|
_DtCvSelectData temp;
|
||||||
|
|
||||||
|
|
|
@ -2108,7 +2108,6 @@ _DtHelpDADestroyGraphic (
|
||||||
_DtCvPointer graphic_ptr )
|
_DtCvPointer graphic_ptr )
|
||||||
{
|
{
|
||||||
Arg args[5];
|
Arg args[5];
|
||||||
int i;
|
|
||||||
|
|
||||||
Colormap colormap;
|
Colormap colormap;
|
||||||
|
|
||||||
|
@ -2179,7 +2178,6 @@ _DtHelpDADestroyRegion (
|
||||||
_DtCvPointer client_data,
|
_DtCvPointer client_data,
|
||||||
_DtCvPointer reg_info)
|
_DtCvPointer reg_info)
|
||||||
{
|
{
|
||||||
DtHelpDispAreaStruct *pDAS = (DtHelpDispAreaStruct *) client_data;
|
|
||||||
_DtHelpDARegion *pReg = (_DtHelpDARegion *) reg_info;
|
_DtHelpDARegion *pReg = (_DtHelpDARegion *) reg_info;
|
||||||
|
|
||||||
if (True == pReg->inited)
|
if (True == pReg->inited)
|
||||||
|
|
|
@ -310,7 +310,6 @@ int _DtGrReadBitmapStream (display, d, stream, width, height, pixmap, x_hot, y_h
|
||||||
int *x_hot, *y_hot; /* RETURNED */
|
int *x_hot, *y_hot; /* RETURNED */
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
Pixmap pix; /* value to return */
|
|
||||||
unsigned char *data;
|
unsigned char *data;
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
|
|
|
@ -154,7 +154,6 @@ static ilError ilDecompJIFExecute (
|
||||||
register ilJPEGPrivPtr pPriv;
|
register ilJPEGPrivPtr pPriv;
|
||||||
ilError error;
|
ilError error;
|
||||||
int i;
|
int i;
|
||||||
iljpgPtr pJPEGPriv;
|
|
||||||
iljpgPtr pPixels[ILJPG_MAX_COMPS];
|
iljpgPtr pPixels[ILJPG_MAX_COMPS];
|
||||||
long nBytesPerRow[ILJPG_MAX_COMPS];
|
long nBytesPerRow[ILJPG_MAX_COMPS];
|
||||||
ilImagePlaneInfo *pPlane;
|
ilImagePlaneInfo *pPlane;
|
||||||
|
|
|
@ -254,7 +254,6 @@ void _iljpgDeDCTFull (
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
register int i;
|
register int i;
|
||||||
register float *oxptr;
|
|
||||||
register int *zptr;
|
register int *zptr;
|
||||||
float ox[64];
|
float ox[64];
|
||||||
register float in0, in1, in2, in3, in4, in5, in6, in7;
|
register float in0, in1, in2, in3, in4, in5, in6, in7;
|
||||||
|
@ -551,7 +550,7 @@ void _iljpgDeDCT4x4 (
|
||||||
register int i;
|
register int i;
|
||||||
register int *zptr;
|
register int *zptr;
|
||||||
float ox[64];
|
float ox[64];
|
||||||
register float in0, in2, in3, in4, in5, in6, in7;
|
register float in0, in2, in3, in4, in5, in7;
|
||||||
register float tmp0, tmp1, tmp2, tmp5, tmp6, tmp7;
|
register float tmp0, tmp1, tmp2, tmp5, tmp6, tmp7;
|
||||||
register float tmp;
|
register float tmp;
|
||||||
register float *oxaddr;
|
register float *oxaddr;
|
||||||
|
|
|
@ -490,7 +490,7 @@ iljpgError _iljpgDehuffExecute (
|
||||||
iljpgDehuffPtr pHuffPriv;
|
iljpgDehuffPtr pHuffPriv;
|
||||||
int coeff_ct = 0;
|
int coeff_ct = 0;
|
||||||
#define is_dc (!coeff_ct) /* First coefficient is DC */
|
#define is_dc (!coeff_ct) /* First coefficient is DC */
|
||||||
int i, delta;
|
int delta;
|
||||||
int len, zrun;
|
int len, zrun;
|
||||||
register BITBUF bitbuf, ch, c;
|
register BITBUF bitbuf, ch, c;
|
||||||
register int bitsleft;
|
register int bitsleft;
|
||||||
|
@ -556,7 +556,6 @@ iljpgError _iljpgDehuffExecute (
|
||||||
next byte (which can't be a marker or error!); set into bitbuf.
|
next byte (which can't be a marker or error!); set into bitbuf.
|
||||||
*/
|
*/
|
||||||
if (pHuffPriv->resetDone) {
|
if (pHuffPriv->resetDone) {
|
||||||
int resetSeen = FALSE;
|
|
||||||
pHuffPriv->resetDone = 0;
|
pHuffPriv->resetDone = 0;
|
||||||
if (!ILJPG_DECODE_GET_BYTE (stream, ch, error))
|
if (!ILJPG_DECODE_GET_BYTE (stream, ch, error))
|
||||||
return error; /* must be more bytes after restart */
|
return error; /* must be more bytes after restart */
|
||||||
|
|
|
@ -199,7 +199,6 @@ ilPipeInfo info;
|
||||||
ilImageDes des;
|
ilImageDes des;
|
||||||
ilImageFormat format;
|
ilImageFormat format;
|
||||||
ilImageInfo *pInfo;
|
ilImageInfo *pInfo;
|
||||||
long width, height;
|
|
||||||
int i;
|
int i;
|
||||||
ilError (*executeProc) ();
|
ilError (*executeProc) ();
|
||||||
|
|
||||||
|
|
|
@ -981,7 +981,7 @@ ilError error;
|
||||||
long imageSequenceNumber;
|
long imageSequenceNumber;
|
||||||
ilByte fourBytes [4];
|
ilByte fourBytes [4];
|
||||||
ilFileOffset IFDOffset;
|
ilFileOffset IFDOffset;
|
||||||
ilFileImagePtr pFileImage, pFileImageHead, pPrevFileImage;
|
ilFileImagePtr pFileImage, pPrevFileImage;
|
||||||
ilTIFFHeader header;
|
ilTIFFHeader header;
|
||||||
register ilFilePtr pFile;
|
register ilFilePtr pFile;
|
||||||
register ilBool bigEndian;
|
register ilBool bigEndian;
|
||||||
|
|
|
@ -155,7 +155,6 @@ static ilError ilReadFileInit (
|
||||||
register ilReadFilePrivPtr pPriv = (ilReadFilePrivPtr)pPrivate;
|
register ilReadFilePrivPtr pPriv = (ilReadFilePrivPtr)pPrivate;
|
||||||
ilFileImagePtr pFileImage;
|
ilFileImagePtr pFileImage;
|
||||||
ilError error;
|
ilError error;
|
||||||
long dstRowBytes;
|
|
||||||
register ilFileTag *pTag;
|
register ilFileTag *pTag;
|
||||||
|
|
||||||
/* Data for tags to read: "numbers" is the array of tag ids, "nTags" in length.
|
/* Data for tags to read: "numbers" is the array of tag ids, "nTags" in length.
|
||||||
|
|
Loading…
Reference in a new issue