removing warning act 3 before changing Wsing-compare errors

preferencesAboutTextFull
Claudio Valerio 13 years ago
parent cf91bdd07f
commit efcc6659af
  1. 4
      src/frameworks/UBFileSystemUtils.cpp
  2. 7
      src/pdf-merger/LZWDecode.cpp
  3. 2
      src/pdf-merger/LZWDecode.h
  4. 7
      src/pdf-merger/OverlayDocumentParser.cpp
  5. 2
      src/pdf-merger/OverlayDocumentParser.h
  6. 2
      src/pdf-merger/Page.cpp
  7. 6
      src/pdf-merger/Rectangle.cpp
  8. 2
      src/pdf-merger/Rectangle.h
  9. 4
      src/pdf-merger/RotationHandler.h
  10. 3
      src/pdf-merger/Utils.cpp

@ -16,10 +16,12 @@
#include "UBFileSystemUtils.h" #include "UBFileSystemUtils.h"
#include <QtGui> #include <QtGui>
#include "globals/UBGlobals.h"
THIRD_PARTY_WARNINGS_DISABLE
#include "quazipfile.h" #include "quazipfile.h"
#include <openssl/md5.h> #include <openssl/md5.h>
THIRD_PARTY_WARNINGS_ENABLE
#include "core/memcheck.h" #include "core/memcheck.h"

@ -13,6 +13,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <iostream> #include <iostream>
#include <QtGlobal>
#include "LZWDecode.h" #include "LZWDecode.h"
#include "FilterPredictor.h" #include "FilterPredictor.h"
@ -31,8 +32,9 @@ LZWDecode::LZWDecode():
_readBits(0), _readBits(0),
_nextCode(0), _nextCode(0),
_bitsToRead(0), _bitsToRead(0),
_curSequenceLength(0), _first(true),
_first(true) _curSequenceLength(0)
{ {
clearTable(); clearTable();
} }
@ -46,6 +48,7 @@ LZWDecode::~LZWDecode()
bool LZWDecode::encode(std::string & decoded) bool LZWDecode::encode(std::string & decoded)
{ {
Q_UNUSED(decoded);
return true; return true;
} }

@ -37,8 +37,8 @@ namespace merge_lib
void clearTable(); void clearTable();
int getCode(); int getCode();
std::string &_encoded;
std::string _dummy; std::string _dummy;
std::string &_encoded;
size_t _curSymbolIndex; size_t _curSymbolIndex;
int _earlyChange; // early parameter int _earlyChange; // early parameter

@ -15,6 +15,7 @@
#include "OverlayDocumentParser.h" #include "OverlayDocumentParser.h"
#include <fstream> #include <fstream>
#include <string.h> #include <string.h>
#include <QtGlobal>
#include "Exception.h" #include "Exception.h"
#include "Object.h" #include "Object.h"
@ -74,7 +75,6 @@ void OverlayDocumentParser::_readXRefAndCreateObjects()
notEndOfFile = false; notEndOfFile = false;
} }
unsigned long toReadAgain = 0;
for(objIter = objectsAndPositions.begin(); objIter != objectsAndPositions.end(); ) for(objIter = objectsAndPositions.begin(); objIter != objectsAndPositions.end(); )
{ {
if((objectsAndSizes[objIter->first] + objIter->second <= nextPartStart) && (objIter->second >= partStart) && ((objIter->second < nextPartStart))) if((objectsAndSizes[objIter->first] + objIter->second <= nextPartStart) && (objIter->second >= partStart) && ((objIter->second < nextPartStart)))
@ -100,6 +100,11 @@ void OverlayDocumentParser::_readXRefAndCreateObjects()
while(notEndOfFile); while(notEndOfFile);
} }
void OverlayDocumentParser::_getFileContent(const char * fileName)
{
Q_UNUSED(fileName);
}
void OverlayDocumentParser::_getPartOfFileContent(long startOfPart, unsigned int length) void OverlayDocumentParser::_getPartOfFileContent(long startOfPart, unsigned int length)
{ {
ifstream pdfFile; ifstream pdfFile;

@ -38,7 +38,7 @@ namespace merge_lib
private: private:
//methods //methods
void _getFileContent(const char * fileName){}; void _getFileContent(const char * fileName);
void _readXRefAndCreateObjects(); void _readXRefAndCreateObjects();
void _readXref(std::map<unsigned int, unsigned long> & objectsAndSizes); void _readXref(std::map<unsigned int, unsigned long> & objectsAndSizes);
void _getPartOfFileContent(long startOfPart, unsigned int length); void _getPartOfFileContent(long startOfPart, unsigned int length);

@ -37,7 +37,7 @@
using namespace merge_lib; using namespace merge_lib;
Page::Page(unsigned int pageNumber): _pageNumber(pageNumber),_root(NULL), _rotation(0) Page::Page(unsigned int pageNumber): _root(NULL),_pageNumber(pageNumber), _rotation(0)
{ {
} }

@ -24,21 +24,21 @@
using namespace merge_lib; using namespace merge_lib;
Rectangle::Rectangle(const char * rectangleName): Rectangle::Rectangle(const char * rectangleName):
_rectangleName(rectangleName),
x1(0), x1(0),
y1(0), y1(0),
x2(0), x2(0),
y2(0), y2(0),
_rectangleName(rectangleName),
_tm() _tm()
{} {}
Rectangle::Rectangle(const char * rectangleName, const std::string content): Rectangle::Rectangle(const char * rectangleName, const std::string content):
_rectangleName(rectangleName),
x1(0), x1(0),
y1(0), y1(0),
x2(0), x2(0),
y2(0) y2(0),
_rectangleName(rectangleName)
{ {
unsigned int rectanglePosition = Parser::findToken(content,rectangleName); unsigned int rectanglePosition = Parser::findToken(content,rectangleName);

@ -40,7 +40,7 @@ namespace merge_lib
double getHeight(); double getHeight();
//members //members
double x1, x2, y1, y2; double x1, y1, x2, y2;
private: private:
//methods //methods
const std::string _getRectangleAsString(const char * delimeter); const std::string _getRectangleAsString(const char * delimeter);

@ -15,6 +15,8 @@
#if !defined RotationHandler_h #if !defined RotationHandler_h
#define RotationHandler_h #define RotationHandler_h
#include <QtGlobal>
#include "PageElementHandler.h" #include "PageElementHandler.h"
#include "Page.h" #include "Page.h"
@ -55,7 +57,7 @@ namespace merge_lib
strin>>rotation; strin>>rotation;
_basePage.setRotation(rotation); _basePage.setRotation(rotation);
} }
virtual void _changeObjectContent(unsigned int startOfPageElement) {}; virtual void _changeObjectContent(unsigned int startOfPageElement) {Q_UNUSED(startOfPageElement);};
//members //members
Page & _basePage; Page & _basePage;

@ -12,6 +12,8 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QtGlobal>
#include "Config.h" #include "Config.h"
#include "Utils.h" #include "Utils.h"
#include "Exception.h" #include "Exception.h"
@ -101,6 +103,7 @@ bool Utils::doubleEquals(const double left, const double right, const double eps
double Utils::normalizeValue(double &val, const double epsilon ) double Utils::normalizeValue(double &val, const double epsilon )
{ {
Q_UNUSED(epsilon);
if( Utils::doubleEquals(val,0)) if( Utils::doubleEquals(val,0))
{ {
val = 0; val = 0;

Loading…
Cancel
Save