Attachment 49681 Details for Bug 38586 – patch to address comment #18

[patch] patch to address comment #18

0001-Changes-per-https-bugs.freedesktop.org-show_bug.cgi-.patch (text/plain), 3.65 KB, created by Joshua Richardson on 2011-07-28 11:21:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joshua Richardson

Created: 2011-07-28 11:21:25 UTC

Size: 3.65 KB

patch

obsolete

>From 5d920c06271e0b582a90159534ed5ca90680d330 Mon Sep 17 00:00:00 2001
>From: Joshua Richardson <jric@chegg.com>
>Date: Thu, 28 Jul 2011 11:17:34 -0700
>Subject: [PATCH] Changes per https://bugs.freedesktop.org/show_bug.cgi?id=38586#c18.
>
>---
> poppler/popplerUtils.h |    4 ----
> utils/HtmlFonts.cc     |    6 ------
> utils/HtmlFonts.h      |    1 -
> utils/HtmlOutputDev.cc |    5 +----
> utils/HtmlOutputDev.h  |    2 --
> 5 files changed, 1 insertions(+), 17 deletions(-)
>
>diff --git a/poppler/popplerUtils.h b/poppler/popplerUtils.h
>index 65bd9a8..e11fa92 100644
>--- a/poppler/popplerUtils.h
>+++ b/poppler/popplerUtils.h
>@@ -21,8 +21,6 @@
> #include <math.h> // fabs
> #include "goo/gtypes.h" // GBool
> 
>-namespace poppler {
>-
> // Returns true iff the difference between a and b is less than the threshold
> // We always use fuzzy math when comparing decimal numbers due to imprecision
> inline GBool is_within(double a, double thresh, double b) {
>@@ -65,6 +63,4 @@ inline void normalizeRotMat(double *mat) {
> 	for (int i = 0; i < 4; i++) mat[i] /= scale;
> }
> 
>-};
>-
> #endif /* UTILS_H_ */
>diff --git a/utils/HtmlFonts.cc b/utils/HtmlFonts.cc
>index ae80034..4b646a0 100755
>--- a/utils/HtmlFonts.cc
>+++ b/utils/HtmlFonts.cc
>@@ -21,12 +21,8 @@
> // Copyright (C) 2008 Boris Toloknov <tlknv@yandex.ru>
> // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
> // Copyright (C) 2010 OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar Potdar (onkar@cdacmumbai.in)
>-<<<<<<< HEAD
>-// Copyright (C) 2011 Joshua Richardson <jric@chegg.com>
> // Copyright (C) 2011 Stephen Reichling <sreichling@chegg.com>
>-=======
> // Copyright (C) 2011 Joshua Richardson <joshuarbox-junk1@yahoo.com>
>->>>>>>> 706007431325b1e8c9bf4cba35c89511b10ebf0c
> //
> // To see a description of the changes please see the Changelog file that
> // came with your tarball or type make ChangeLog if you are building from git
>@@ -39,8 +35,6 @@
> #include <stdio.h>
> #include "popplerUtils.h"
> 
>-using namespace poppler;
>-
>  struct Fonts{
>     char *Fontname;
>     char *name;
>diff --git a/utils/HtmlFonts.h b/utils/HtmlFonts.h
>index b5a126c..ee50070 100755
>--- a/utils/HtmlFonts.h
>+++ b/utils/HtmlFonts.h
>@@ -69,7 +69,6 @@ class HtmlFont{
>    static GooString *DefaultFont;
>    GooString *FontName;
>    HtmlFontColor color;
>-   static GooString* HtmlFilter(Unicode* u, int uLen); //char* s);
>    double rotSkewMat[4]; // only four values needed for rotation and skew
> public:  
> 
>diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
>index 9032798..e318445 100755
>--- a/utils/HtmlOutputDev.cc
>+++ b/utils/HtmlOutputDev.cc
>@@ -70,14 +70,11 @@
> #if 0
> #define DEBUG(stuff) if (debug) { std::cerr << __FILE__ << ": " << __LINE__ << ": DEBUG: " << stuff << std::endl; } else {}
> #endif
>-// returns true iff x is closer to y than x is to z
>-#define IS_CLOSER(x,y,z) (fabs((x)-(y)) <fabs((x)-(z)))
> 
> using namespace std;
>-using namespace poppler;
> 
> // returns true if x is closer to y than x is to z
>-static inline bool IS_CLOSER(float x, float y, float z) { return fabs((x)-(y)) < fabs((x)-(z)); }
>+inline bool IS_CLOSER(float x, float y, float z) { return fabs((x)-(y)) < fabs((x)-(z)); }
> 
> int HtmlPage::pgNum=0;
> int HtmlOutputDev::imgNum=1;
>diff --git a/utils/HtmlOutputDev.h b/utils/HtmlOutputDev.h
>index bc6ac80..e914bd3 100755
>--- a/utils/HtmlOutputDev.h
>+++ b/utils/HtmlOutputDev.h
>@@ -55,8 +55,6 @@
> 
> #define xoutRound(x) ((int)(x + 0.5))
> 
>-//#define DOCTYPE "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">"
>-//#define DOCTYPE_FRAMES "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\"\n\"http://www.w3.org/TR/html4/frameset.dtd\">"
> #define DOCTYPE "<!DOCTYPE html>"
> #define DOCTYPE_FRAMES "<!DOCTYPE html>"
> 
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 38586: 48316 | 48317 | 48318 | 48319 | 48320 | 48321 | 48383 | 48530 | 48531 | 48532 | 49681

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.