Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ZBarSDK.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Pod::Spec.new do |s|
s.summary = 'QR and barcode scan library.'
s.homepage = 'http://zbar.sourceforge.net/'
s.author = { 'Jeff Brown' => 'spadix@users.sourceforge.net' }
s.source = { :git => 'https://github.com/cduhn/ZBar.git', :tag => 'iPhoneSDK-1.3.1' }
s.source = { :git => 'https://github.com/lerosua/ZBarSDK.git', :tag =>"fixWarning-1.3.1" }

s.description = 'ZBar is an open source software suite for reading bar codes from various sources, such as video streams, ' \
'image files and raw intensity sensors. It supports many popular symbologies (types of bar codes) including ' \
Expand All @@ -25,6 +25,7 @@ Pod::Spec.new do |s|
s.frameworks = 'AVFoundation', 'CoreGraphics', 'CoreMedia', 'CoreVideo', 'QuartzCore'

s.library = 'iconv'
s.requires_arc = false

s.xcconfig = { "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" => 'ZBarReaderViewImpl_Simulator.m',
"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" => 'ZBarReaderViewImpl_Capture.m ZBarCaptureReader.m',
Expand All @@ -33,4 +34,4 @@ Pod::Spec.new do |s|
s.prefix_header_file = 'iphone/include/prefix.pch'

s.compiler_flags = '-w'
end
end
1 change: 1 addition & 0 deletions zbar/decoder/code93.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ decode_start (zbar_decoder_t *dcode)
if(dir) {
if(decode_e(pair_width(dcode, 0), s, 9))
return(ZBAR_NONE);
#pragma unused(qz)
qz = get_width(dcode, 8);
}

Expand Down
2 changes: 1 addition & 1 deletion zbar/decoder/databar.c
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ match_segment_exp (zbar_decoder_t *dcode,
databar_decoder_t *db = &dcode->databar;
int bestsegs[22], i = 0, segs[22], seq[22];
int ifixed = seg - db->segs, fixed = IDX(seg), maxcnt = 0;
int iseg[DATABAR_MAX_SEGMENTS];
int iseg[DATABAR_MAX_SEGMENTS]={0};
unsigned csegs = db->csegs, width = seg->width, maxage = 0x7fff;

bestsegs[0] = segs[0] = seq[1] = -1;
Expand Down
1 change: 1 addition & 0 deletions zbar/error.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ const char *_zbar_error_string (const void *container,
#endif
else {
err->buf = realloc(err->buf, len + 2);
#pragma unused(len)
len += sprintf(err->buf + len, "\n");
}
return(err->buf);
Expand Down
1 change: 1 addition & 0 deletions zbar/image.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ int zbar_image_write (const zbar_image_t *img,
FILE *f;
zimg_hdr_t hdr;
strcpy(filename, filebase);
#pragma unused(n)
if((img->format & 0xff) >= ' ')
n = snprintf(filename, len, "%s.%.4s.zimg",
filebase, (char*)&img->format);
Expand Down
1 change: 1 addition & 0 deletions zbar/img_scanner.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,7 @@ int zbar_scan_image (zbar_image_scanner_t *iscn,
img->syms = syms;

w = img->width;
#pragma unused(h)
h = img->height;
cx1 = img->crop_x + img->crop_w;
assert(cx1 <= w);
Expand Down