diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-13 23:12:36 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-18 15:30:05 +0200 |
commit | a6f229bb452e3f1ce43f6c893b00cef3c5503c21 (patch) | |
tree | b63424b8892a495a100f28ae666458424fab5f9d /extensions | |
parent | Avoid reserved identifiers (diff) | |
download | core-a6f229bb452e3f1ce43f6c893b00cef3c5503c21.tar.gz core-a6f229bb452e3f1ce43f6c893b00cef3c5503c21.zip |
Avoid reserved identifier
Change-Id: Ic1f02173e268934df2edbbb2ed752b4736c6e959
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/scanner/sane.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 5f2187359ddd..f1bff60c0552 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -475,7 +475,7 @@ enum FrameStyleType { #define BYTE_BUFFER_SIZE 32768 -static inline sal_uInt8 _ReadValue( FILE* fp, int depth ) +static inline sal_uInt8 ReadValue( FILE* fp, int depth ) { if( depth == 16 ) { @@ -799,7 +799,7 @@ bool Sane::Start( BitmapTransporter& rBitmap ) { for( i = 0; i < (aParams.pixels_per_line); i++ ) { - sal_uInt8 nGray = _ReadValue( pFrame, aParams.depth ); + sal_uInt8 nGray = ReadValue( pFrame, aParams.depth ); aConverter.WriteUChar( nGray ); } } @@ -808,9 +808,9 @@ bool Sane::Start( BitmapTransporter& rBitmap ) for( i = 0; i < (aParams.pixels_per_line); i++ ) { sal_uInt8 nRed, nGreen, nBlue; - nRed = _ReadValue( pFrame, aParams.depth ); - nGreen = _ReadValue( pFrame, aParams.depth ); - nBlue = _ReadValue( pFrame, aParams.depth ); + nRed = ReadValue( pFrame, aParams.depth ); + nGreen = ReadValue( pFrame, aParams.depth ); + nBlue = ReadValue( pFrame, aParams.depth ); aConverter.WriteUChar( nBlue ); aConverter.WriteUChar( nGreen ); aConverter.WriteUChar( nRed ); @@ -820,7 +820,7 @@ bool Sane::Start( BitmapTransporter& rBitmap ) { for( i = 0; i < (aParams.pixels_per_line); i++ ) { - sal_uInt8 nValue = _ReadValue( pFrame, aParams.depth ); + sal_uInt8 nValue = ReadValue( pFrame, aParams.depth ); switch( aParams.format ) { case SANE_FRAME_RED: |