Remplacement du carillon par le tintinabule.

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@381 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/graphics/photos-instruments/_MG_0393.psd b/graphics/photos-instruments/_MG_0393.psd
new file mode 100644 (file)
index 0000000..94210e8
Binary files /dev/null and b/graphics/photos-instruments/_MG_0393.psd differ

diff --git a/graphics/photos-instruments/_MG_0393.xmp b/graphics/photos-instruments/_MG_0393.xmp
index d7932b6..fa5e3ab 100644 (file)
--- a/graphics/photos-instruments/_MG_0393.xmp
+++ b/graphics/photos-instruments/_MG_0393.xmp
@@ -5,8 +5,6 @@
    <tiff:Make>Canon</tiff:Make>
    <tiff:Model>Canon EOS 5D Mark II</tiff:Model>
    <tiff:Orientation>1</tiff:Orientation>
-   <tiff:ImageWidth>5616</tiff:ImageWidth>
-   <tiff:ImageLength>3744</tiff:ImageLength>
   </rdf:Description>
   <rdf:Description rdf:about=""
     xmlns:exif="http://ns.adobe.com/exif/1.0/">
@@ -16,22 +14,10 @@
    <exif:FNumber>5/1</exif:FNumber>
    <exif:ApertureValue>4643856/1000000</exif:ApertureValue>
    <exif:ExposureProgram>2</exif:ExposureProgram>
-   <exif:ISOSpeedRatings>
-    <rdf:Seq>
-     <rdf:li>100</rdf:li>
-    </rdf:Seq>
-   </exif:ISOSpeedRatings>
    <exif:ExposureBiasValue>0/1</exif:ExposureBiasValue>
    <exif:MaxApertureValue>3/1</exif:MaxApertureValue>
    <exif:SubjectDistance>189/100</exif:SubjectDistance>
    <exif:MeteringMode>5</exif:MeteringMode>
-   <exif:Flash rdf:parseType="Resource">
-    <exif:Fired>False</exif:Fired>
-    <exif:Return>0</exif:Return>
-    <exif:Mode>2</exif:Mode>
-    <exif:Function>False</exif:Function>
-    <exif:RedEyeMode>False</exif:RedEyeMode>
-   </exif:Flash>
    <exif:FocalLength>58/1</exif:FocalLength>
    <exif:CustomRendered>0</exif:CustomRendered>
    <exif:ExposureMode>0</exif:ExposureMode>
@@ -41,8 +27,18 @@
    <exif:FocalPlaneYResolution>3744000/958</exif:FocalPlaneYResolution>
    <exif:FocalPlaneResolutionUnit>2</exif:FocalPlaneResolutionUnit>
    <exif:DateTimeOriginal>2011-08-13T15:17:38.41</exif:DateTimeOriginal>
-   <exif:PixelXDimension>5616</exif:PixelXDimension>
-   <exif:PixelYDimension>3744</exif:PixelYDimension>
+   <exif:ISOSpeedRatings>
+    <rdf:Seq>
+     <rdf:li>100</rdf:li>
+    </rdf:Seq>
+   </exif:ISOSpeedRatings>
+   <exif:Flash rdf:parseType="Resource">
+    <exif:Fired>False</exif:Fired>
+    <exif:Return>0</exif:Return>
+    <exif:Mode>2</exif:Mode>
+    <exif:Function>False</exif:Function>
+    <exif:RedEyeMode>False</exif:RedEyeMode>
+   </exif:Flash>
   </rdf:Description>
   <rdf:Description rdf:about=""
     xmlns:aux="http://ns.adobe.com/exif/1.0/aux/">
@@ -59,11 +55,13 @@
     xmlns:xmp="http://ns.adobe.com/xap/1.0/">
    <xmp:ModifyDate>2011-08-13T15:17:38.41</xmp:ModifyDate>
    <xmp:CreateDate>2011-08-13T15:17:38.41</xmp:CreateDate>
-   <xmp:MetadataDate>2011-08-15T12:00:01+02:00</xmp:MetadataDate>
+   <xmp:MetadataDate>2011-09-09T11:06:17+02:00</xmp:MetadataDate>
+   <xmp:Rating>0</xmp:Rating>
   </rdf:Description>
   <rdf:Description rdf:about=""
     xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
    <photoshop:DateCreated>2011-08-13T15:17:38.41</photoshop:DateCreated>
+   <photoshop:SidecarForExtension>CR2</photoshop:SidecarForExtension>
   </rdf:Description>
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -72,6 +70,123 @@
      <rdf:li xml:lang="x-default">Tintinabule</rdf:li>
     </rdf:Alt>
    </dc:description>
+   <dc:format>image/x-canon-cr2</dc:format>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+    xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
+   <xmpMM:DocumentID>41B37FE1CC15E5D48738A666A9046F1D</xmpMM:DocumentID>
+   <xmpMM:OriginalDocumentID>41B37FE1CC15E5D48738A666A9046F1D</xmpMM:OriginalDocumentID>
+   <xmpMM:InstanceID>xmp.iid:01801174072068118083FEC7446B2D3C</xmpMM:InstanceID>
+   <xmpMM:History>
+    <rdf:Seq>
+     <rdf:li rdf:parseType="Resource">
+      <stEvt:action>saved</stEvt:action>
+      <stEvt:instanceID>xmp.iid:01801174072068118083FEC7446B2D3C</stEvt:instanceID>
+      <stEvt:when>2011-09-09T11:06:17+02:00</stEvt:when>
+      <stEvt:softwareAgent>Adobe Photoshop Camera Raw 6.4.1</stEvt:softwareAgent>
+      <stEvt:changed>/metadata</stEvt:changed>
+     </rdf:li>
+    </rdf:Seq>
+   </xmpMM:History>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/">
+   <crs:RawFileName>_MG_0393.CR2</crs:RawFileName>
+   <crs:Version>6.4.1</crs:Version>
+   <crs:ProcessVersion>5.7</crs:ProcessVersion>
+   <crs:WhiteBalance>As Shot</crs:WhiteBalance>
+   <crs:Temperature>5150</crs:Temperature>
+   <crs:Tint>-5</crs:Tint>
+   <crs:Exposure>0.00</crs:Exposure>
+   <crs:Shadows>5</crs:Shadows>
+   <crs:Brightness>+50</crs:Brightness>
+   <crs:Contrast>+25</crs:Contrast>
+   <crs:Saturation>0</crs:Saturation>
+   <crs:Sharpness>25</crs:Sharpness>
+   <crs:LuminanceSmoothing>0</crs:LuminanceSmoothing>
+   <crs:ColorNoiseReduction>25</crs:ColorNoiseReduction>
+   <crs:ChromaticAberrationR>0</crs:ChromaticAberrationR>
+   <crs:ChromaticAberrationB>0</crs:ChromaticAberrationB>
+   <crs:VignetteAmount>0</crs:VignetteAmount>
+   <crs:ShadowTint>0</crs:ShadowTint>
+   <crs:RedHue>0</crs:RedHue>
+   <crs:RedSaturation>0</crs:RedSaturation>
+   <crs:GreenHue>0</crs:GreenHue>
+   <crs:GreenSaturation>0</crs:GreenSaturation>
+   <crs:BlueHue>0</crs:BlueHue>
+   <crs:BlueSaturation>0</crs:BlueSaturation>
+   <crs:FillLight>0</crs:FillLight>
+   <crs:Vibrance>0</crs:Vibrance>
+   <crs:HighlightRecovery>0</crs:HighlightRecovery>
+   <crs:Clarity>0</crs:Clarity>
+   <crs:Defringe>0</crs:Defringe>
+   <crs:HueAdjustmentRed>0</crs:HueAdjustmentRed>
+   <crs:HueAdjustmentOrange>0</crs:HueAdjustmentOrange>
+   <crs:HueAdjustmentYellow>0</crs:HueAdjustmentYellow>
+   <crs:HueAdjustmentGreen>0</crs:HueAdjustmentGreen>
+   <crs:HueAdjustmentAqua>0</crs:HueAdjustmentAqua>
+   <crs:HueAdjustmentBlue>0</crs:HueAdjustmentBlue>
+   <crs:HueAdjustmentPurple>0</crs:HueAdjustmentPurple>
+   <crs:HueAdjustmentMagenta>0</crs:HueAdjustmentMagenta>
+   <crs:SaturationAdjustmentRed>0</crs:SaturationAdjustmentRed>
+   <crs:SaturationAdjustmentOrange>0</crs:SaturationAdjustmentOrange>
+   <crs:SaturationAdjustmentYellow>0</crs:SaturationAdjustmentYellow>
+   <crs:SaturationAdjustmentGreen>0</crs:SaturationAdjustmentGreen>
+   <crs:SaturationAdjustmentAqua>0</crs:SaturationAdjustmentAqua>
+   <crs:SaturationAdjustmentBlue>0</crs:SaturationAdjustmentBlue>
+   <crs:SaturationAdjustmentPurple>0</crs:SaturationAdjustmentPurple>
+   <crs:SaturationAdjustmentMagenta>0</crs:SaturationAdjustmentMagenta>
+   <crs:LuminanceAdjustmentRed>0</crs:LuminanceAdjustmentRed>
+   <crs:LuminanceAdjustmentOrange>0</crs:LuminanceAdjustmentOrange>
+   <crs:LuminanceAdjustmentYellow>0</crs:LuminanceAdjustmentYellow>
+   <crs:LuminanceAdjustmentGreen>0</crs:LuminanceAdjustmentGreen>
+   <crs:LuminanceAdjustmentAqua>0</crs:LuminanceAdjustmentAqua>
+   <crs:LuminanceAdjustmentBlue>0</crs:LuminanceAdjustmentBlue>
+   <crs:LuminanceAdjustmentPurple>0</crs:LuminanceAdjustmentPurple>
+   <crs:LuminanceAdjustmentMagenta>0</crs:LuminanceAdjustmentMagenta>
+   <crs:SplitToningShadowHue>0</crs:SplitToningShadowHue>
+   <crs:SplitToningShadowSaturation>0</crs:SplitToningShadowSaturation>
+   <crs:SplitToningHighlightHue>0</crs:SplitToningHighlightHue>
+   <crs:SplitToningHighlightSaturation>0</crs:SplitToningHighlightSaturation>
+   <crs:SplitToningBalance>0</crs:SplitToningBalance>
+   <crs:ParametricShadows>0</crs:ParametricShadows>
+   <crs:ParametricDarks>0</crs:ParametricDarks>
+   <crs:ParametricLights>0</crs:ParametricLights>
+   <crs:ParametricHighlights>0</crs:ParametricHighlights>
+   <crs:ParametricShadowSplit>25</crs:ParametricShadowSplit>
+   <crs:ParametricMidtoneSplit>50</crs:ParametricMidtoneSplit>
+   <crs:ParametricHighlightSplit>75</crs:ParametricHighlightSplit>
+   <crs:SharpenRadius>+1.0</crs:SharpenRadius>
+   <crs:SharpenDetail>25</crs:SharpenDetail>
+   <crs:SharpenEdgeMasking>0</crs:SharpenEdgeMasking>
+   <crs:PostCropVignetteAmount>0</crs:PostCropVignetteAmount>
+   <crs:GrainAmount>0</crs:GrainAmount>
+   <crs:ColorNoiseReductionDetail>50</crs:ColorNoiseReductionDetail>
+   <crs:LensProfileEnable>0</crs:LensProfileEnable>
+   <crs:LensManualDistortionAmount>0</crs:LensManualDistortionAmount>
+   <crs:PerspectiveVertical>0</crs:PerspectiveVertical>
+   <crs:PerspectiveHorizontal>0</crs:PerspectiveHorizontal>
+   <crs:PerspectiveRotate>0.0</crs:PerspectiveRotate>
+   <crs:PerspectiveScale>100</crs:PerspectiveScale>
+   <crs:ConvertToGrayscale>False</crs:ConvertToGrayscale>
+   <crs:ToneCurveName>Medium Contrast</crs:ToneCurveName>
+   <crs:ToneCurve>
+    <rdf:Seq>
+     <rdf:li>0, 0</rdf:li>
+     <rdf:li>32, 22</rdf:li>
+     <rdf:li>64, 56</rdf:li>
+     <rdf:li>128, 128</rdf:li>
+     <rdf:li>192, 196</rdf:li>
+     <rdf:li>255, 255</rdf:li>
+    </rdf:Seq>
+   </crs:ToneCurve>
+   <crs:CameraProfile>Adobe Standard</crs:CameraProfile>
+   <crs:CameraProfileDigest>3DA8CE4A626CE36A1D0C55BF157793C9</crs:CameraProfileDigest>
+   <crs:LensProfileSetup>LensDefaults</crs:LensProfileSetup>
+   <crs:HasSettings>True</crs:HasSettings>
+   <crs:HasCrop>False</crs:HasCrop>
+   <crs:AlreadyApplied>False</crs:AlreadyApplied>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>

diff --git a/src/minwii/widgets/data/instruments/carillon.jpg b/src/minwii/widgets/data/instruments/carillon.jpg
index 2cb012b..9809db5 100755 (executable)
Binary files a/src/minwii/widgets/data/instruments/carillon.jpg and b/src/minwii/widgets/data/instruments/carillon.jpg differ