3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 --- CameraAssistant/defaultconfig.h~g++-3.4-compile-fixes
7 +++ CameraAssistant/defaultconfig.h
9 #define DEFAULTCONFIG_H
14 - <Settings version=\"0.0.3\">
15 - <defaultAdjustments value='1'/>
16 - <defaultCameraCategory value='Photo'/>
17 - <defaultCameraType value='35mm'/>
18 - <defaultAspectRatio value='Full aperture'/>
21 - <CameraCategory name='Television'>
22 - <CameraType name='1/4\"' coc='0.00800' width='3.2' height='2.4' />
23 - <CameraType name='1/3\"' coc='0.01100' width='4.8' height='3.6' />
24 - <CameraType name='1/2\"' coc='0.01500' width='6.4' height='4.8' />
25 - <CameraType name='2/3\"' coc='0.02000' width='8.8' height='6.6'>
26 - <AspectRatio name='4:3' />
27 - <AspectRatio name='16:9' aspectratio='1.77778' />
29 - <CameraType name='1\"' coc='0.03000' width='12.7' height='9.525' />
31 - <CameraCategory name='Film'>
32 - <CameraType name='16mm' coc='0.01524' width='10.2616' height='7.493'>
33 - <AspectRatio name='Full aperture' />
34 - <AspectRatio name='TV (station)' width='9.652' height='7.2644' />
35 - <AspectRatio name='TV (transmitted)' width='9.3472' height='7.0104' />
36 - <AspectRatio name='TV (safe action)' width='8.4074' height='6.2992' />
37 - <AspectRatio name='TV (safe title)' width='7.4422' height='5.6134' />
38 - <AspectRatio name='1.85:1' width='9.602' height='5.207' />
40 - <CameraType name='16mm (super)' coc='0.01524' width='12.5222' height='7.4168'>
41 - <AspectRatio name='Full aperture' />
42 - <AspectRatio name='1.66' width='11.7602' height='7.0866' />
43 - <AspectRatio name='1.85' width='11.7602' height='6.3754' />
45 - <CameraType name='35mm' coc='0.02540' width='21.9456' height='16.002'>
46 - <AspectRatio name='Full aperture' />
47 - <AspectRatio name='TV (station)' width='20.7264' height='15.5448' />
48 - <AspectRatio name='TV (transmitted)' width='20.1168' height='15.0876' />
49 - <AspectRatio name='TV (safe action)' width='18.1102' height='13.589' />
50 - <AspectRatio name='TV (safe title)' width='16.002' height='12.085' />
51 - <AspectRatio name='1.37:1' width='20.955' height='15.2908' />
52 - <AspectRatio name='1.66:1' width='20.955' height='12.6238' />
53 - <AspectRatio name='1.75:1' width='20.955' height='11.9634' />
54 - <AspectRatio name='1.85:1' width='20.955' height='11.3284' />
56 - <CameraType name='35mm (super)' coc='0.02540' width='24.892' height='18.669'>
57 - <AspectRatio name='Full aperture' />
58 - <AspectRatio name='FLAT 1.85:1' width='24.003' height='12.9794' />
59 - <AspectRatio name='2.20:1' width='24.003' height='10.0076' />
60 - <AspectRatio name='2.40:1' width='24.003' height='10.922' />
62 - <CameraType name='65mm' coc='0.03556' width='52.4764' height='23.0124' />
63 - <CameraType name='70mm' coc='0.03556' width='48.5648' height='22.098' />
64 - <CameraType name='Omnimax' coc='0.03556' width='37.719' height='25.1714' />
66 - <CameraCategory name='Photo'>
67 - <CameraType name='APS' width='30.2' height='16.7' coc='0.01995'>
68 - <AspectRatio name='H' aspectratio='1.80838' />
69 - <AspectRatio name='C' aspectratio='-1.49701' />
70 - <AspectRatio name='P' aspectratio='3.02' />
72 - <CameraType name='35mm' width='36' height='24' coc='0.02501'>
73 - <AspectRatio name='Full aperture' />
74 - <AspectRatio name='Panorama' aspectratio='2.70677' />
76 - <CameraType name='6x4.5' width='56' height='42' coc='0.04335' />
77 - <CameraType name='6x6' width='56' height='56' coc='0.04905' />
78 - <CameraType name='6x7' width='56' height='69.5' coc='0.05329' />
79 - <CameraType name='6x9' width='56' height='84' coc='0.06252' />
86 +" <Settings version=\"0.0.3\">"
87 +" <defaultAdjustments value='1'/>"
88 +" <defaultCameraCategory value='Photo'/>"
89 +" <defaultCameraType value='35mm'/>"
90 +" <defaultAspectRatio value='Full aperture'/>"
93 +" <CameraCategory name='Television'>"
94 +" <CameraType name='1/4\"' coc='0.00800' width='3.2' height='2.4' />"
95 +" <CameraType name='1/3\"' coc='0.01100' width='4.8' height='3.6' />"
96 +" <CameraType name='1/2\"' coc='0.01500' width='6.4' height='4.8' />"
97 +" <CameraType name='2/3\"' coc='0.02000' width='8.8' height='6.6'>"
98 +" <AspectRatio name='4:3' />"
99 +" <AspectRatio name='16:9' aspectratio='1.77778' />"
101 +" <CameraType name='1\"' coc='0.03000' width='12.7' height='9.525' />"
102 +" </CameraCategory>"
103 +" <CameraCategory name='Film'>"
104 +" <CameraType name='16mm' coc='0.01524' width='10.2616' height='7.493'>"
105 +" <AspectRatio name='Full aperture' />"
106 +" <AspectRatio name='TV (station)' width='9.652' height='7.2644' />"
107 +" <AspectRatio name='TV (transmitted)' width='9.3472' height='7.0104' />"
108 +" <AspectRatio name='TV (safe action)' width='8.4074' height='6.2992' />"
109 +" <AspectRatio name='TV (safe title)' width='7.4422' height='5.6134' />"
110 +" <AspectRatio name='1.85:1' width='9.602' height='5.207' />"
112 +" <CameraType name='16mm (super)' coc='0.01524' width='12.5222' height='7.4168'>"
113 +" <AspectRatio name='Full aperture' />"
114 +" <AspectRatio name='1.66' width='11.7602' height='7.0866' />"
115 +" <AspectRatio name='1.85' width='11.7602' height='6.3754' />"
117 +" <CameraType name='35mm' coc='0.02540' width='21.9456' height='16.002'>"
118 +" <AspectRatio name='Full aperture' />"
119 +" <AspectRatio name='TV (station)' width='20.7264' height='15.5448' />"
120 +" <AspectRatio name='TV (transmitted)' width='20.1168' height='15.0876' />"
121 +" <AspectRatio name='TV (safe action)' width='18.1102' height='13.589' />"
122 +" <AspectRatio name='TV (safe title)' width='16.002' height='12.085' />"
123 +" <AspectRatio name='1.37:1' width='20.955' height='15.2908' />"
124 +" <AspectRatio name='1.66:1' width='20.955' height='12.6238' />"
125 +" <AspectRatio name='1.75:1' width='20.955' height='11.9634' />"
126 +" <AspectRatio name='1.85:1' width='20.955' height='11.3284' />"
128 +" <CameraType name='35mm (super)' coc='0.02540' width='24.892' height='18.669'>"
129 +" <AspectRatio name='Full aperture' />"
130 +" <AspectRatio name='FLAT 1.85:1' width='24.003' height='12.9794' />"
131 +" <AspectRatio name='2.20:1' width='24.003' height='10.0076' />"
132 +" <AspectRatio name='2.40:1' width='24.003' height='10.922' />"
134 +" <CameraType name='65mm' coc='0.03556' width='52.4764' height='23.0124' />"
135 +" <CameraType name='70mm' coc='0.03556' width='48.5648' height='22.098' />"
136 +" <CameraType name='Omnimax' coc='0.03556' width='37.719' height='25.1714' />"
137 +" </CameraCategory>"
138 +" <CameraCategory name='Photo'>"
139 +" <CameraType name='APS' width='30.2' height='16.7' coc='0.01995'>"
140 +" <AspectRatio name='H' aspectratio='1.80838' />"
141 +" <AspectRatio name='C' aspectratio='-1.49701' />"
142 +" <AspectRatio name='P' aspectratio='3.02' />"
144 +" <CameraType name='35mm' width='36' height='24' coc='0.02501'>"
145 +" <AspectRatio name='Full aperture' />"
146 +" <AspectRatio name='Panorama' aspectratio='2.70677' />"
148 +" <CameraType name='6x4.5' width='56' height='42' coc='0.04335' />"
149 +" <CameraType name='6x6' width='56' height='56' coc='0.04905' />"
150 +" <CameraType name='6x7' width='56' height='69.5' coc='0.05329' />"
151 +" <CameraType name='6x9' width='56' height='84' coc='0.06252' />"
152 +" </CameraCategory>"
154 +"</CameraAssistant>";
155 #endif // DEFAULTCONFIG_H