iOS: Lion and Xcode updates

  - fix new warnings/errors
  - find missing buddy
  - fix SDK bg image: force resoution to 72dpi

iphone/ZBarReaderView.m

@@ -41,7 +41,7 @@ + (id) alloc
     if(self == [ZBarReaderView class]) {
         // this is an abstract wrapper for implementation selected
         // at compile time.  replace with concrete subclass.
-        return([ZBarReaderViewImpl alloc]);
+        return((id)[ZBarReaderViewImpl alloc]);
     }
     return([super alloc]);
 }

iphone/ZBarReaderViewController.m

@@ -82,7 +82,8 @@
         return(AVCaptureTorchModeAuto);
     case UIImagePickerControllerCameraFlashModeOn:
         return(AVCaptureTorchModeOn);
-    //case UIImagePickerControllerCameraFlashModeOff:
+    case UIImagePickerControllerCameraFlashModeOff:
+        break;
     }
     return(AVCaptureTorchModeOff);
 }
@@ -101,6 +102,10 @@
         return(AVCaptureSessionPresetMedium);
     case UIImagePickerControllerQualityTypeLow:
         return(AVCaptureSessionPresetLow);
+    case UIImagePickerControllerQualityTypeIFrame1280x720:
+        return(AVCaptureSessionPresetiFrame1280x720);
+    case UIImagePickerControllerQualityTypeIFrame960x540:
+        return(AVCaptureSessionPresetiFrame960x540);
     }
 #endif
     return(nil);
@@ -184,7 +189,7 @@ - (id) init
         // fallback to old interface
         zlog(@"Falling back to ZBarReaderController");
         [self release];
-        return([ZBarReaderController new]);
+        return((id)[ZBarReaderController new]);
     }
 
     self = [super init];

iphone/bin/CreateDMG.sh

@@ -3,8 +3,11 @@ set -ux
 VOLNAME=${1:?}
 shift
 RES=$SOURCE_ROOT/res
-BUDDY=$(xcrun -find PlistBuddy) \
-    || exit 1
+BUDDY=/usr/libexec/PlistBuddy
+if [ ! -x "$BUDDY" ]; then
+    BUDDY=$(xcrun -find PlistBuddy) \
+        || exit 1
+fi
 VERSION=$($BUDDY -c 'Print :CFBundleVersion' $RES/$VOLNAME-Info.plist) \
     || exit 1
 DMG=$VOLNAME-$VERSION

iphone/doc/ZBarImage.rst

@@ -23,7 +23,7 @@ Properties
    .. member:: unsigned long format
 
       The image format four-charcter code (fourcc) as a 4-byte integer.  Use
-      :ref:`fourcc:` to create a fourcc value from a string.
+      :ref:`fourcc:<fourcc:>` to create a fourcc value from a string.
 
    .. member:: unsigned sequence
 
@@ -47,12 +47,12 @@ Properties
    .. member:: const void *data
 
       Obtain a pointer to the raw image data.  This property is read-only, use
-      :ref:`setData:withLength:` to set the image data.
+      :ref:`setData:withLength:<setData:withLength:>` to set the image data.
 
    .. member:: unsigned long dataLength
 
       Byte length of the raw image data.  This property is read-only, use 
-      :ref:`setData:withLength:` to set the image data.
+      :ref:`setData:withLength:<setData:withLength:>` to set the image data.
 
    .. member:: ZBarSymbolSet *symbols
 
@@ -67,7 +67,7 @@ Properties
       Convert the image to a UIImage.  Only certain image formats are
       supported for conversion (read-only)
 
-      :See also: :ref:`UIImageWithOrientation:`
+      :See also: :ref:`UIImageWithOrientation:<UIImageWithOrientation:>`
 
 
 Class Methods
@@ -102,7 +102,7 @@ Instance Methods
 
       :image: A `CGImage` to source the data and metadata.
       :Returns: The initialized :class:`ZBarImage`.
-      :See also: :ref:`initWithCGImage:size:`
+      :See also: :ref:`initWithCGImage:size:<initWithCGImage:size:>`
 
    .. _`initWithCGImage:size:`:
    .. describe:: - (id) initWithCGImage:(CGImageRef)image size:(CGSize)size
@@ -114,7 +114,7 @@ Instance Methods
       :image: A `CGImage` to source the data and metadata.
       :size: The pixel size of the resulting ZBarImage.
       :Returns: The initialized :class:`ZBarImage`.
-      :See also: :ref:`initWithCGImage:crop:size:`
+      :See also: :ref:`initWithCGImage:crop:size:<initWithCGImage:crop:size:>`
 
    .. _`initWithCGImage:crop:size:`:
    .. describe:: - (id) initWithCGImage:(CGImageRef)image crop:(CGRect)crop size:(CGSize)size

iphone/doc/camera.rst

@@ -64,7 +64,7 @@ you are familiar with that.  Basically you:
 5. Process the results.
 
    The controller will call the
-   :member:`imagePickerController:didFinishPickingMediaWithInfo:` method of
+   ``imagePickerController:didFinishPickingMediaWithInfo:`` method of
    your delegate every time new results become available.  The barcode data
    can be obtained using the :c:data:`ZBarReaderControllerResults` key of the
    info dictionary.  This key will return "something enumerable"; keep in mind

iphone/doc/picker.rst

@@ -46,7 +46,7 @@ documentation for :class:`UIImagePickerController` for more detais.
 5. Process the results.
 
    The controller will call the
-   :member:`imagePickerController:didFinishPickingMediaWithInfo:` method of
+   ``imagePickerController:didFinishPickingMediaWithInfo:`` method of
    your delegate for a successful decode (NB *not* every time the user takes a
    picture or selects an image).  The barcode data can be obtained using the
    :c:data:`ZBarReaderControllerResults` key of the info dictionary.  This key

zbar/img_scanner.c

@@ -816,10 +816,10 @@ int zbar_scan_image (zbar_image_scanner_t *iscn,
         for(symp = &syms->head; *symp; ) {
             zbar_symbol_t *sym = *symp;
             if(sym->cache_count <= 0 &&
-               (sym->type < ZBAR_COMPOSITE && sym->type > ZBAR_PARTIAL) ||
-               sym->type == ZBAR_DATABAR ||
-               sym->type == ZBAR_DATABAR_EXP ||
-               sym->type == ZBAR_CODABAR)
+               ((sym->type < ZBAR_COMPOSITE && sym->type > ZBAR_PARTIAL) ||
+                sym->type == ZBAR_DATABAR ||
+                sym->type == ZBAR_DATABAR_EXP ||
+                sym->type == ZBAR_CODABAR))
             {
 	        if((sym->type == ZBAR_CODABAR || filter) && sym->quality < 4) {
                     if(iscn->enable_cache) {