wineps.drv: PSDRV_CmpColor() and PSDRV_Write{ArrayGet, InitClip, RRectangle}()…

dlls/wineps.drv/color.c

@@ -23,33 +23,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
-/**********************************************************************
- *	     PSDRV_CmpColor
- *
- * Return TRUE if col1 == col2
- */
-BOOL PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2)
-{
-    if(col1->type != col2->type)
-        return FALSE;
-
-    switch(col1->type) {
-    case PSCOLOR_GRAY:
-        if(col1->value.gray.i == col2->value.gray.i)
-	    return TRUE;
-	break;
-    case PSCOLOR_RGB:
-        if( col1->value.rgb.r == col2->value.rgb.r &&
-	    col1->value.rgb.g == col2->value.rgb.g &&
-	    col1->value.rgb.b == col2->value.rgb.b )
-	    return TRUE;
-	break;
-    default:
-        ERR("Unknown colour type %d\n", col1->type);
-    }
-    return FALSE;
-}
-
 
 /**********************************************************************
  *	     PSDRV_CopyColor

dlls/wineps.drv/ps.c

@@ -112,13 +112,6 @@ static const char psrectangle[] = /* x, y, width, height, -width */
 "%d 0 rlineto\n"
 "closepath\n";
 
-static const char psrrectangle[] = /* x, y, width, height, -width */
-"%d %d rmoveto\n"
-"%d 0 rlineto\n"
-"0 %d rlineto\n"
-"%d 0 rlineto\n"
-"closepath\n";
-
 static const char psglyphshow[] = /* glyph name */
 "/%s glyphshow\n";
 
@@ -169,9 +162,6 @@ static const char psclosepath[] =
 static const char psclip[] =
 "clip\n";
 
-static const char psinitclip[] =
-"initclip\n";
-
 static const char pseoclip[] =
 "eoclip\n";
 
@@ -187,9 +177,6 @@ static const char pshatch[] =
 static const char psrotate[] = /* ang */
 "%.1f rotate\n";
 
-static const char psarrayget[] =
-"%s %d get\n";
-
 static const char psarrayput[] =
 "%s %d %d put\n";
 
@@ -508,15 +495,6 @@ BOOL PSDRV_WriteRectangle(PSDRV_PDEVICE *physDev, INT x, INT y, INT width,
     return PSDRV_WriteSpool(physDev, buf, strlen(buf));
 }
 
-BOOL PSDRV_WriteRRectangle(PSDRV_PDEVICE *physDev, INT x, INT y, INT width,
-      INT height)
-{
-    char buf[100];
-
-    sprintf(buf, psrrectangle, x, y, width, height, -width);
-    return PSDRV_WriteSpool(physDev, buf, strlen(buf));
-}
-
 BOOL PSDRV_WriteArc(PSDRV_PDEVICE *physDev, INT x, INT y, INT w, INT h, double ang1,
 		      double ang2)
 {
@@ -651,11 +629,6 @@ BOOL PSDRV_WriteEOClip(PSDRV_PDEVICE *physDev)
     return PSDRV_WriteSpool(physDev, pseoclip, sizeof(pseoclip)-1);
 }
 
-BOOL PSDRV_WriteInitClip(PSDRV_PDEVICE *physDev)
-{
-    return PSDRV_WriteSpool(physDev, psinitclip, sizeof(psinitclip)-1);
-}
-
 BOOL PSDRV_WriteHatch(PSDRV_PDEVICE *physDev)
 {
     return PSDRV_WriteSpool(physDev, pshatch, sizeof(pshatch)-1);
@@ -808,14 +781,6 @@ BOOL PSDRV_WriteData(PSDRV_PDEVICE *physDev, const BYTE *data, DWORD number)
     return TRUE;
 }
 
-BOOL PSDRV_WriteArrayGet(PSDRV_PDEVICE *physDev, CHAR *pszArrayName, INT nIndex)
-{
-    char buf[100];
-
-    sprintf(buf, psarrayget, pszArrayName, nIndex);
-    return PSDRV_WriteSpool(physDev, buf, strlen(buf));
-}
-
 BOOL PSDRV_WriteArrayPut(PSDRV_PDEVICE *physDev, CHAR *pszArrayName, INT nIndex, LONG lObject)
 {
     char buf[100];

dlls/wineps.drv/psdrv.h

@@ -426,7 +426,6 @@ extern BOOL PSDRV_SetPen( PSDRV_PDEVICE *physDev );
 extern void PSDRV_SetClip(PSDRV_PDEVICE* phyDev);
 extern void PSDRV_ResetClip(PSDRV_PDEVICE* phyDev);
 
-extern BOOL PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2);
 extern BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2);
 extern void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor,
 		     COLORREF wincolor );
@@ -457,7 +456,6 @@ extern BOOL PSDRV_WriteGSave(PSDRV_PDEVICE *physDev);
 extern BOOL PSDRV_WriteGRestore(PSDRV_PDEVICE *physDev);
 extern BOOL PSDRV_WriteNewPath(PSDRV_PDEVICE *physDev);
 extern BOOL PSDRV_WriteClosePath(PSDRV_PDEVICE *physDev);
-extern BOOL PSDRV_WriteInitClip(PSDRV_PDEVICE *physDev);
 extern BOOL PSDRV_WriteClip(PSDRV_PDEVICE *physDev);
 extern BOOL PSDRV_WriteRectClip(PSDRV_PDEVICE *physDev, INT x, INT y, INT w, INT h);
 extern BOOL PSDRV_WriteRectClip2(PSDRV_PDEVICE *physDev, CHAR *pszArrayName);