From 5d920c06271e0b582a90159534ed5ca90680d330 Mon Sep 17 00:00:00 2001 From: Joshua Richardson 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 // 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 // Copyright (C) 2008 Tomas Are Haavet // Copyright (C) 2010 OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar Potdar (onkar@cdacmumbai.in) -<<<<<<< HEAD -// Copyright (C) 2011 Joshua Richardson // Copyright (C) 2011 Stephen Reichling -======= // Copyright (C) 2011 Joshua Richardson ->>>>>>> 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 #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)) " -//#define DOCTYPE_FRAMES "" #define DOCTYPE "" #define DOCTYPE_FRAMES "" -- 1.7.4.1