diff options
Diffstat (limited to 'camera-assistant/g++-3.4-compile-fixes.patch')
| -rw-r--r-- | camera-assistant/g++-3.4-compile-fixes.patch | 155 |
1 files changed, 155 insertions, 0 deletions
diff --git a/camera-assistant/g++-3.4-compile-fixes.patch b/camera-assistant/g++-3.4-compile-fixes.patch index e69de29bb2..383d083981 100644 --- a/camera-assistant/g++-3.4-compile-fixes.patch +++ b/camera-assistant/g++-3.4-compile-fixes.patch @@ -0,0 +1,155 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- CameraAssistant/defaultconfig.h~g++-3.4-compile-fixes ++++ CameraAssistant/defaultconfig.h +@@ -2,76 +2,75 @@ + #define DEFAULTCONFIG_H + + char defaultConfig[]= +-" +-<CameraAssistant> +- <Settings version=\"0.0.3\"> +- <defaultAdjustments value='1'/> +- <defaultCameraCategory value='Photo'/> +- <defaultCameraType value='35mm'/> +- <defaultAspectRatio value='Full aperture'/> +- </Settings> +- <Cameras> +- <CameraCategory name='Television'> +- <CameraType name='1/4\"' coc='0.00800' width='3.2' height='2.4' /> +- <CameraType name='1/3\"' coc='0.01100' width='4.8' height='3.6' /> +- <CameraType name='1/2\"' coc='0.01500' width='6.4' height='4.8' /> +- <CameraType name='2/3\"' coc='0.02000' width='8.8' height='6.6'> +- <AspectRatio name='4:3' /> +- <AspectRatio name='16:9' aspectratio='1.77778' /> +- </CameraType> +- <CameraType name='1\"' coc='0.03000' width='12.7' height='9.525' /> +- </CameraCategory> +- <CameraCategory name='Film'> +- <CameraType name='16mm' coc='0.01524' width='10.2616' height='7.493'> +- <AspectRatio name='Full aperture' /> +- <AspectRatio name='TV (station)' width='9.652' height='7.2644' /> +- <AspectRatio name='TV (transmitted)' width='9.3472' height='7.0104' /> +- <AspectRatio name='TV (safe action)' width='8.4074' height='6.2992' /> +- <AspectRatio name='TV (safe title)' width='7.4422' height='5.6134' /> +- <AspectRatio name='1.85:1' width='9.602' height='5.207' /> +- </CameraType> +- <CameraType name='16mm (super)' coc='0.01524' width='12.5222' height='7.4168'> +- <AspectRatio name='Full aperture' /> +- <AspectRatio name='1.66' width='11.7602' height='7.0866' /> +- <AspectRatio name='1.85' width='11.7602' height='6.3754' /> +- </CameraType> +- <CameraType name='35mm' coc='0.02540' width='21.9456' height='16.002'> +- <AspectRatio name='Full aperture' /> +- <AspectRatio name='TV (station)' width='20.7264' height='15.5448' /> +- <AspectRatio name='TV (transmitted)' width='20.1168' height='15.0876' /> +- <AspectRatio name='TV (safe action)' width='18.1102' height='13.589' /> +- <AspectRatio name='TV (safe title)' width='16.002' height='12.085' /> +- <AspectRatio name='1.37:1' width='20.955' height='15.2908' /> +- <AspectRatio name='1.66:1' width='20.955' height='12.6238' /> +- <AspectRatio name='1.75:1' width='20.955' height='11.9634' /> +- <AspectRatio name='1.85:1' width='20.955' height='11.3284' /> +- </CameraType> +- <CameraType name='35mm (super)' coc='0.02540' width='24.892' height='18.669'> +- <AspectRatio name='Full aperture' /> +- <AspectRatio name='FLAT 1.85:1' width='24.003' height='12.9794' /> +- <AspectRatio name='2.20:1' width='24.003' height='10.0076' /> +- <AspectRatio name='2.40:1' width='24.003' height='10.922' /> +- </CameraType> +- <CameraType name='65mm' coc='0.03556' width='52.4764' height='23.0124' /> +- <CameraType name='70mm' coc='0.03556' width='48.5648' height='22.098' /> +- <CameraType name='Omnimax' coc='0.03556' width='37.719' height='25.1714' /> +- </CameraCategory> +- <CameraCategory name='Photo'> +- <CameraType name='APS' width='30.2' height='16.7' coc='0.01995'> +- <AspectRatio name='H' aspectratio='1.80838' /> +- <AspectRatio name='C' aspectratio='-1.49701' /> +- <AspectRatio name='P' aspectratio='3.02' /> +- </CameraType> +- <CameraType name='35mm' width='36' height='24' coc='0.02501'> +- <AspectRatio name='Full aperture' /> +- <AspectRatio name='Panorama' aspectratio='2.70677' /> +- </CameraType> +- <CameraType name='6x4.5' width='56' height='42' coc='0.04335' /> +- <CameraType name='6x6' width='56' height='56' coc='0.04905' /> +- <CameraType name='6x7' width='56' height='69.5' coc='0.05329' /> +- <CameraType name='6x9' width='56' height='84' coc='0.06252' /> +- </CameraCategory> +- </Cameras> +-</CameraAssistant> +-"; ++"" ++"<CameraAssistant>" ++" <Settings version=\"0.0.3\">" ++" <defaultAdjustments value='1'/>" ++" <defaultCameraCategory value='Photo'/>" ++" <defaultCameraType value='35mm'/>" ++" <defaultAspectRatio value='Full aperture'/>" ++" </Settings>" ++" <Cameras>" ++" <CameraCategory name='Television'>" ++" <CameraType name='1/4\"' coc='0.00800' width='3.2' height='2.4' />" ++" <CameraType name='1/3\"' coc='0.01100' width='4.8' height='3.6' />" ++" <CameraType name='1/2\"' coc='0.01500' width='6.4' height='4.8' />" ++" <CameraType name='2/3\"' coc='0.02000' width='8.8' height='6.6'>" ++" <AspectRatio name='4:3' />" ++" <AspectRatio name='16:9' aspectratio='1.77778' />" ++" </CameraType>" ++" <CameraType name='1\"' coc='0.03000' width='12.7' height='9.525' />" ++" </CameraCategory>" ++" <CameraCategory name='Film'>" ++" <CameraType name='16mm' coc='0.01524' width='10.2616' height='7.493'>" ++" <AspectRatio name='Full aperture' />" ++" <AspectRatio name='TV (station)' width='9.652' height='7.2644' />" ++" <AspectRatio name='TV (transmitted)' width='9.3472' height='7.0104' />" ++" <AspectRatio name='TV (safe action)' width='8.4074' height='6.2992' />" ++" <AspectRatio name='TV (safe title)' width='7.4422' height='5.6134' />" ++" <AspectRatio name='1.85:1' width='9.602' height='5.207' />" ++" </CameraType>" ++" <CameraType name='16mm (super)' coc='0.01524' width='12.5222' height='7.4168'>" ++" <AspectRatio name='Full aperture' />" ++" <AspectRatio name='1.66' width='11.7602' height='7.0866' />" ++" <AspectRatio name='1.85' width='11.7602' height='6.3754' />" ++" </CameraType>" ++" <CameraType name='35mm' coc='0.02540' width='21.9456' height='16.002'>" ++" <AspectRatio name='Full aperture' />" ++" <AspectRatio name='TV (station)' width='20.7264' height='15.5448' />" ++" <AspectRatio name='TV (transmitted)' width='20.1168' height='15.0876' />" ++" <AspectRatio name='TV (safe action)' width='18.1102' height='13.589' />" ++" <AspectRatio name='TV (safe title)' width='16.002' height='12.085' />" ++" <AspectRatio name='1.37:1' width='20.955' height='15.2908' />" ++" <AspectRatio name='1.66:1' width='20.955' height='12.6238' />" ++" <AspectRatio name='1.75:1' width='20.955' height='11.9634' />" ++" <AspectRatio name='1.85:1' width='20.955' height='11.3284' />" ++" </CameraType>" ++" <CameraType name='35mm (super)' coc='0.02540' width='24.892' height='18.669'>" ++" <AspectRatio name='Full aperture' />" ++" <AspectRatio name='FLAT 1.85:1' width='24.003' height='12.9794' />" ++" <AspectRatio name='2.20:1' width='24.003' height='10.0076' />" ++" <AspectRatio name='2.40:1' width='24.003' height='10.922' />" ++" </CameraType>" ++" <CameraType name='65mm' coc='0.03556' width='52.4764' height='23.0124' />" ++" <CameraType name='70mm' coc='0.03556' width='48.5648' height='22.098' />" ++" <CameraType name='Omnimax' coc='0.03556' width='37.719' height='25.1714' />" ++" </CameraCategory>" ++" <CameraCategory name='Photo'>" ++" <CameraType name='APS' width='30.2' height='16.7' coc='0.01995'>" ++" <AspectRatio name='H' aspectratio='1.80838' />" ++" <AspectRatio name='C' aspectratio='-1.49701' />" ++" <AspectRatio name='P' aspectratio='3.02' />" ++" </CameraType>" ++" <CameraType name='35mm' width='36' height='24' coc='0.02501'>" ++" <AspectRatio name='Full aperture' />" ++" <AspectRatio name='Panorama' aspectratio='2.70677' />" ++" </CameraType>" ++" <CameraType name='6x4.5' width='56' height='42' coc='0.04335' />" ++" <CameraType name='6x6' width='56' height='56' coc='0.04905' />" ++" <CameraType name='6x7' width='56' height='69.5' coc='0.05329' />" ++" <CameraType name='6x9' width='56' height='84' coc='0.06252' />" ++" </CameraCategory>" ++" </Cameras>" ++"</CameraAssistant>"; + #endif // DEFAULTCONFIG_H |