author | Petr Sumbera <petr.sumbera@oracle.com> |
Wed, 05 Oct 2016 01:21:05 -0700 | |
branch | s11u3-sru |
changeset 7090 | 49c102d793d0 |
parent 6088 | 4ba51a8313aa |
permissions | -rw-r--r-- |
6088
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
1 |
/* This is an upstream patch. Details: https://www.cups.org/strfiles.php/3438/str4551.patch |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
2 |
Index: filter/raster.c |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
3 |
=================================================================== */ |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
4 |
--- filter/raster.c (revision 12451) |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
5 |
+++ filter/raster.c (working copy) |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
6 |
@@ -3,7 +3,7 @@ |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
7 |
* |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
8 |
* Raster file routines for CUPS. |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
9 |
* |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
10 |
- * Copyright 2007-2010 by Apple Inc. |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
11 |
+ * Copyright 2007-2015 by Apple Inc. |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
12 |
* Copyright 1997-2006 by Easy Software Products. |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
13 |
* |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
14 |
* This file is part of the CUPS Imaging library. |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
15 |
@@ -239,7 +240,10 @@ |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
16 |
*/ |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
17 |
|
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
18 |
if (!cups_raster_read_header(r)) |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
19 |
+ { |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
20 |
+ memset(h, 0, sizeof(cups_page_header_t)); |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
21 |
return (0); |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
22 |
+ } |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
23 |
|
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
24 |
/* |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
25 |
* Copy the header to the user-supplied buffer... |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
26 |
@@ -268,7 +272,10 @@ |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
27 |
*/ |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
28 |
|
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
29 |
if (!cups_raster_read_header(r)) |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
30 |
+ { |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
31 |
+ memset(h, 0, sizeof(cups_page_header2_t)); |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
32 |
return (0); |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
33 |
+ } |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
34 |
|
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
35 |
/* |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
36 |
* Copy the header to the user-supplied buffer... |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
37 |
@@ -762,7 +762,7 @@ |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
38 |
|
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
39 |
cups_raster_update(r); |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
40 |
|
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
41 |
- return (1); |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
42 |
+ return (r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0); |
4ba51a8313aa
20648341 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
43 |
} |