From 657db433c3004bbe22be157cf21a067837e556ae Mon Sep 17 00:00:00 2001 From: "gln%google.com@gtempaccount.com" Date: Mon, 2 Apr 2012 17:45:07 +0000 Subject: [PATCH] Fix code where a string literal and an integer are added to together. This is treated as pointer arithmetic since the string literal is a pointer to a const char. git-svn-id: http://zxing.googlecode.com/svn/trunk@2246 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- cpp/core/src/zxing/common/GreyscaleLuminanceSource.cpp | 2 +- cpp/core/src/zxing/common/GreyscaleRotatedLuminanceSource.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/core/src/zxing/common/GreyscaleLuminanceSource.cpp b/cpp/core/src/zxing/common/GreyscaleLuminanceSource.cpp index 4910b653d4..b6c917f5c6 100644 --- a/cpp/core/src/zxing/common/GreyscaleLuminanceSource.cpp +++ b/cpp/core/src/zxing/common/GreyscaleLuminanceSource.cpp @@ -35,7 +35,7 @@ GreyscaleLuminanceSource::GreyscaleLuminanceSource(unsigned char* greyData, int unsigned char* GreyscaleLuminanceSource::getRow(int y, unsigned char* row) { if (y < 0 || y >= this->getHeight()) { - throw IllegalArgumentException("Requested row is outside the image: " + y); + throw IllegalArgumentException("Requested row is outside the image."); } int width = getWidth(); // TODO(flyashi): determine if row has enough size. diff --git a/cpp/core/src/zxing/common/GreyscaleRotatedLuminanceSource.cpp b/cpp/core/src/zxing/common/GreyscaleRotatedLuminanceSource.cpp index 498b5ea0d8..a5dc354929 100644 --- a/cpp/core/src/zxing/common/GreyscaleRotatedLuminanceSource.cpp +++ b/cpp/core/src/zxing/common/GreyscaleRotatedLuminanceSource.cpp @@ -39,7 +39,7 @@ GreyscaleRotatedLuminanceSource::GreyscaleRotatedLuminanceSource(unsigned char* // The API asks for rows, but we're rotated, so we return columns. unsigned char* GreyscaleRotatedLuminanceSource::getRow(int y, unsigned char* row) { if (y < 0 || y >= getHeight()) { - throw IllegalArgumentException("Requested row is outside the image: " + y); + throw IllegalArgumentException("Requested row is outside the image."); } int width = getWidth(); if (row == NULL) {