rpms/cups/devel cups-svn.patch,1.3,1.4 cups.spec,1.180,1.181
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri May 5 13:08:19 UTC 2006
- Previous message (by thread): rpms/openswan/devel .cvsignore,1.10,1.11 sources,1.10,1.11
- Next message (by thread): rpms/gsl/devel .cvsignore, 1.10, 1.11 gsl.spec, 1.21, 1.22 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30350
Modified Files:
cups-svn.patch cups.spec
Log Message:
* Fri May 5 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.3
- Sync to svn5491.
cups-svn.patch:
0 files changed
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 cups-svn.patch
Index: cups-svn.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-svn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-svn.patch 2 May 2006 11:32:17 -0000 1.3
+++ cups-svn.patch 5 May 2006 13:07:46 -0000 1.4
@@ -1,3 +1,8142 @@
+--- pdftops/SplashFontFileID.h (revision 5460)
++++ pdftops/SplashFontFileID.h (working copy)
+@@ -1,30 +0,0 @@
+-//========================================================================
+-//
+-// SplashFontFileID.h
+-//
+-//========================================================================
+-
+-#ifndef SPLASHFONTFILEID_H
+-#define SPLASHFONTFILEID_H
+-
+-#include <config.h>
+-
+-#ifdef USE_GCC_PRAGMAS
+-#pragma interface
+-#endif
+-
+-#include "gtypes.h"
+-
+-//------------------------------------------------------------------------
+-// SplashFontFileID
+-//------------------------------------------------------------------------
+-
+-class SplashFontFileID {
+-public:
+-
+- SplashFontFileID();
+- virtual ~SplashFontFileID();
+- virtual GBool matches(SplashFontFileID *id) = 0;
+-};
+-
+-#endif
+--- pdftops/SplashScreen.cxx (revision 5460)
++++ pdftops/SplashScreen.cxx (working copy)
+@@ -1,141 +0,0 @@
+-//========================================================================
+-//
+-// SplashScreen.cc
+-//
+-//========================================================================
+-
+-#include <config.h>
+-
+-#ifdef USE_GCC_PRAGMAS
+-#pragma implementation
+-#endif
+-
+-#include <string.h>
+-#include "gmem.h"
+-#include "SplashMath.h"
+-#include "SplashScreen.h"
+-
+-//------------------------------------------------------------------------
+-// SplashScreen
+-//------------------------------------------------------------------------
+-
+-// This generates a 45 degree screen using a circular dot spot
+-// function. DPI = resolution / ((size / 2) * sqrt(2)).
+-// Gamma correction (gamma = 1 / 1.33) is also computed here.
+-SplashScreen::SplashScreen(int sizeA) {
+- SplashCoord *dist;
+- SplashCoord u, v, d, val;
+- int size2, x, y, x1, y1, i;
+-
+- size2 = sizeA >> 1;
+- if (size2 < 1) {
+- size2 = 1;
+- }
+- size = size2 << 1;
+-
+- // initialize the threshold matrix
+- mat = (SplashCoord *)gmallocn(size * size, sizeof(SplashCoord));
+- for (y = 0; y < size; ++y) {
+- for (x = 0; x < size; ++x) {
+- mat[y * size + x] = -1;
+- }
+- }
+-
+- // build the distance matrix
+- dist = (SplashCoord *)gmallocn(size * size2, sizeof(SplashCoord));
+- for (y = 0; y < size2; ++y) {
+- for (x = 0; x < size2; ++x) {
+- if (x + y < size2 - 1) {
+- u = (SplashCoord)x + 0.5 - 0;
+- v = (SplashCoord)y + 0.5 - 0;
+- } else {
+- u = (SplashCoord)x + 0.5 - (SplashCoord)size2;
+- v = (SplashCoord)y + 0.5 - (SplashCoord)size2;
+- }
+- dist[y * size2 + x] = u*u + v*v;
+- }
+- }
+- for (y = 0; y < size2; ++y) {
+- for (x = 0; x < size2; ++x) {
+- if (x < y) {
+- u = (SplashCoord)x + 0.5 - 0;
+- v = (SplashCoord)y + 0.5 - (SplashCoord)size2;
+- } else {
+- u = (SplashCoord)x + 0.5 - (SplashCoord)size2;
+- v = (SplashCoord)y + 0.5 - 0;
+- }
+- dist[(size2 + y) * size2 + x] = u*u + v*v;
+- }
+- }
+-
+- // build the threshold matrix
+- minVal = 1;
+- maxVal = 0;
+- x1 = y1 = 0; // make gcc happy
+- for (i = 1; i <= size * size2; ++i) {
+- d = size * size2;
+- for (y = 0; y < size; ++y) {
+- for (x = 0; x < size2; ++x) {
+- if (mat[y * size + x] < 0 &&
+- dist[y * size2 + x] < d) {
+- x1 = x;
+- y1 = y;
+- d = dist[y1 * size2 + x1];
+- }
+- }
+- }
+- u = (SplashCoord)1 - (SplashCoord)i / (SplashCoord)(size * size2 + 1);
+- val = splashPow(u, 1.33);
+- if (val < minVal) {
+- minVal = val;
+- }
+- if (val > maxVal) {
+- maxVal = val;
+- }
+- mat[y1 * size + x1] = val;
+- if (y1 < size2) {
+- mat[(y1 + size2) * size + x1 + size2] = val;
+- } else {
+- mat[(y1 - size2) * size + x1 + size2] = val;
+- }
+- }
+-
+- gfree(dist);
+-}
+-
+-SplashScreen::SplashScreen(SplashScreen *screen) {
+- int n;
+-
+- size = screen->size;
+- n = size * size * sizeof(SplashCoord);
+- mat = (SplashCoord *)gmalloc(n);
+- memcpy(mat, screen->mat, n);
+- minVal = screen->minVal;
+- maxVal = screen->maxVal;
+-}
+-
+-SplashScreen::~SplashScreen() {
+- gfree(mat);
+-}
+-
+-int SplashScreen::test(int x, int y, SplashCoord value) {
+- int xx, yy;
+-
+- if (value < minVal) {
+- return 0;
+- }
+- if (value >= maxVal) {
+- return 1;
+- }
+- if ((xx = x % size) < 0) {
+- xx = -xx;
+- }
+- if ((yy = y % size) < 0) {
+- yy = -yy;
+- }
+- return value < mat[yy * size + xx] ? 0 : 1;
+-}
+-
+-GBool SplashScreen::isStatic(SplashCoord value) {
+- return value < minVal || value >= maxVal;
+-}
+--- pdftops/SplashFont.h (revision 5460)
++++ pdftops/SplashFont.h (working copy)
+@@ -1,97 +0,0 @@
+-//========================================================================
+-//
+-// SplashFont.h
+-//
+-//========================================================================
+-
+-#ifndef SPLASHFONT_H
+-#define SPLASHFONT_H
+-
+-#include <config.h>
+-
[...12562 lines suppressed...]
+- * Copyright 1997-2005 by Easy Software Products, all rights reserved.
++ * Copyright 1997-2006 by Easy Software Products, all rights reserved.
+@@ -26,5 +26,5 @@
+- * cupsdGetDateTime() - Returns a pointer to a date/time string.
+- * cupsdLogMessage() - Log a message to the error log file.
+- * cupsdLogPage() - Log a page to the page log file.
+- * cupsdLogRequest() - Log an HTTP request in Common Log Format.
+- * check_log_file() - Open/rotate a log file if it needs it.
++ * cupsdGetDateTime() - Returns a pointer to a date/time string.
++ * cupsdLogMessage() - Log a message to the error log file.
++ * cupsdLogPage() - Log a page to the page log file.
++ * cupsdLogRequest() - Log an HTTP request in Common Log Format.
++ * check_log_file() - Open/rotate a log file if it needs it.
+@@ -428 +428,3 @@
+- if (!*lf || (cupsFileTell(*lf) > MaxLogSize && MaxLogSize > 0))
++ if (!*lf ||
++ (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
++ MaxLogSize > 0))
+@@ -511 +513,2 @@
+- if (cupsFileTell(*lf) > MaxLogSize && MaxLogSize > 0)
++ if (strncmp(filename, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
++ MaxLogSize > 0)
+@@ -533,5 +536,3 @@
+- if (strncmp(filename, "/dev/", 5))
+- {
+- /*
+- * Change ownership and permissions of non-device logs...
+- */
++ /*
++ * Change ownership and permissions of non-device logs...
++ */
+@@ -539,3 +540,2 @@
+- fchown(cupsFileNumber(*lf), RunUser, Group);
+- fchmod(cupsFileNumber(*lf), LogFilePerm);
+- }
++ fchown(cupsFileNumber(*lf), RunUser, Group);
++ fchmod(cupsFileNumber(*lf), LogFilePerm);
+--- scheduler/main.c (revision 5460)
++++ scheduler/main.c (working copy)
+@@ -221,0 +222,6 @@
++ case 'p' : /* Stop immediately for profiling */
++ puts("Warning: -p option is for internal testing use only!");
++ stop_scheduler = 1;
++ fg = 1;
++ break;
++
+@@ -706 +712 @@
+- cupsdLogMessage(CUPSD_LOG_EMERG, s);
++ cupsdLogMessage(CUPSD_LOG_EMERG, "%s", s);
+@@ -720 +726 @@
+- cupsdLogMessage(CUPSD_LOG_EMERG, s);
++ cupsdLogMessage(CUPSD_LOG_EMERG, "%s", s);
+--- scheduler/filter.c (revision 5460)
++++ scheduler/filter.c (working copy)
+@@ -62,0 +63 @@
++static int compare_srcs(mime_filter_t *, mime_filter_t *);
+@@ -117 +118,4 @@
+- if (!mime->filters)
++ if (!mime->srcs)
++ mime->srcs = cupsArrayNew((cups_array_func_t)compare_srcs, NULL);
++
++ if (!mime->filters || !mime->srcs)
+@@ -132,0 +137 @@
++ cupsArrayAdd(mime->srcs, temp);
+@@ -198,0 +204,18 @@
++ * 'compare_srcs()' - Compare two srcs...
++ */
++
++static int /* O - Comparison result */
++compare_srcs(mime_filter_t *f0, /* I - First filter */
++ mime_filter_t *f1) /* I - Second filter */
++{
++ int i; /* Result of comparison */
++
++
++ if ((i = strcmp(f0->src->super, f1->src->super)) == 0)
++ i = strcmp(f0->src->type, f1->src->type);
++
++ return (i);
++}
++
++
++/*
+@@ -213 +236,2 @@
+- mime_filter_t *current; /* Current filter */
++ mime_filter_t *current, /* Current filter */
++ srckey; /* Source type key */
+@@ -240,0 +265,3 @@
++ if (!cost)
++ return (mintemp);
++
+@@ -264,9 +291 @@
+- for (current = (mime_filter_t *)cupsArrayFirst(mime->filters);
+- current;
+- current = (mime_filter_t *)cupsArrayNext(mime->filters))
+- if (current->src == src)
+- {
+- /*
+- * See if we have already tried the destination type as a source
+- * type (this avoids extra filter looping...)
+- */
++ srckey.src = src;
+@@ -274,3 +293,8 @@
+- for (listptr = list; listptr; listptr = listptr->next)
+- if (current->dst == listptr->src)
+- break;
++ for (current = (mime_filter_t *)cupsArrayFind(mime->srcs, &srckey);
++ current && current->src == src;
++ current = (mime_filter_t *)cupsArrayNext(mime->srcs))
++ {
++ /*
++ * See if we have already tried the destination type as a source
++ * type (this avoids extra filter looping...)
++ */
+@@ -278,2 +302 @@
+- if (listptr)
+- continue;
++ mime_type_t *current_dst; /* Current destination type */
+@@ -281,4 +303,0 @@
+- /*
+- * See if we have any filters that can convert from the destination type
+- * of this filter to the final type...
+- */
+@@ -286 +305,13 @@
+- listnode.src = current->src;
++ for (listptr = list, current_dst = current->dst;
++ listptr;
++ listptr = listptr->next)
++ if (current_dst == listptr->src)
++ break;
++
++ if (listptr)
++ continue;
++
++ /*
++ * See if we have any filters that can convert from the destination type
++ * of this filter to the final type...
++ */
+@@ -288,3 +319 @@
+- cupsArraySave(mime->filters);
+- temp = find_filters(mime, current->dst, dst, &tempcost, &listnode);
+- cupsArrayRestore(mime->filters);
++ listnode.src = current->src;
+@@ -292,2 +321,18 @@
+- if (!temp)
+- continue;
++ cupsArraySave(mime->srcs);
++ temp = find_filters(mime, current->dst, dst, &tempcost, &listnode);
++ cupsArrayRestore(mime->srcs);
++
++ if (!temp)
++ continue;
++
++ if (!cost)
++ return (temp);
++
++ /*
++ * Found a match; see if this one is less costly than the last (if
++ * any...)
++ */
++
++ if (tempcost < mincost)
++ {
++ cupsArrayDelete(mintemp);
+@@ -296,2 +341,2 @@
+- * Found a match; see if this one is less costly than the last (if
+- * any...)
++ * Hey, we got a match! Add the current filter to the beginning of the
++ * filter list...
+@@ -300,15 +345,3 @@
+- if (tempcost < mincost)
+- {
+- cupsArrayDelete(mintemp);
+-
+- /*
+- * Hey, we got a match! Add the current filter to the beginning of the
+- * filter list...
+- */
+-
+- mintemp = temp;
+- mincost = tempcost + current->cost;
+- cupsArrayInsert(mintemp, current);
+- }
+- else
+- cupsArrayDelete(temp);
++ mintemp = temp;
++ mincost = tempcost + current->cost;
++ cupsArrayInsert(mintemp, current);
+@@ -315,0 +349,3 @@
++ else
++ cupsArrayDelete(temp);
++ }
+--- scheduler/mime.c (revision 5460)
++++ scheduler/mime.c (working copy)
+@@ -122,0 +123 @@
++ cupsArrayDelete(mime->srcs);
+--- scheduler/mime.h (revision 5460)
++++ scheduler/mime.h (working copy)
+@@ -113,0 +114 @@
++ cups_array_t *srcs; /* Filters sorted by source type */
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- cups.spec 2 May 2006 11:32:17 -0000 1.180
+++ cups.spec 5 May 2006 13:08:02 -0000 1.181
@@ -6,7 +6,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.2
-Release: 0.5.%{beta}.2
+Release: 0.5.%{beta}.3
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -371,8 +371,8 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
-* Tue May 2 2006 Tim Waugh <twaugh at redhat.com>
-- Sync to svn5473.
+* Fri May 5 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.3
+- Sync to svn5491.
* Fri Apr 28 2006 Tim Waugh <twaugh at redhat.com>
- Sync to svn5470.
- Previous message (by thread): rpms/openswan/devel .cvsignore,1.10,1.11 sources,1.10,1.11
- Next message (by thread): rpms/gsl/devel .cvsignore, 1.10, 1.11 gsl.spec, 1.21, 1.22 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list