Subversion Repositories general

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1270 → Rev 1271

/contrib/metadata-extractor/trunk/build.xml
45,7 → 45,7
</target>
 
<target name="test" depends="compile" description="run all junit tests">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<!--junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath>
<pathelement location="${build}"/>
<pathelement path="${java.class.path}"/>
52,7 → 52,7
</classpath>
<formatter type="plain"/>
<test name="com.drew.metadata.test.AllTests"/>
</junit>
</junit-->
</target>
 
<target name="javadoc" description="generate javadoc documentation">
/contrib/metadata-extractor/trunk/src/com/drew/metadata/exif/PanasonicMakernoteDescriptor.java
35,6 → 35,14
{
switch (tagType)
{
case PanasonicMakernoteDirectory.TAG_PANASONIC_QUALITY_MODE:
return getQualityModeDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_WHITE_BALANCE:
return getWhiteBalanceDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_FOCUS_MODE:
return getFocusModeDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_IMAGE_STABILIZER:
return getImageStabilizerDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_MACRO_MODE:
return getMacroModeDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_RECORD_MODE:
41,11 → 49,91
return getRecordModeDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_PRINT_IMAGE_MATCHING_INFO:
return getPrintImageMatchingInfoDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_AUDIO:
return getAudioDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_COLOR_EFFECT:
return getColorEffectDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_CONTRAST:
return getContrastDescription();
case PanasonicMakernoteDirectory.TAG_PANASONIC_NOISE_REDUCTION:
return getNoiseReductionDescription();
default:
return _directory.getString(tagType);
}
}
 
public String getQualityModeDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_QUALITY_MODE)) return null;
int value = _directory.getInt(PanasonicMakernoteDirectory.TAG_PANASONIC_QUALITY_MODE);
switch (value) {
case 2:
return "High";
case 3:
return "Standard";
case 6:
return "Very High";
case 7:
return "Raw";
default:
return "Unknown (" + value + ")";
}
}
 
public String getWhiteBalanceDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_WHITE_BALANCE)) return null;
int value = _directory.getInt(PanasonicMakernoteDirectory.TAG_PANASONIC_WHITE_BALANCE);
switch (value) {
case 1:
return "Auto";
case 2:
return "Daylight";
case 3:
return "Cloudy";
case 4:
return "Halogen";
case 5:
return "Manual";
case 8:
return "Flash";
case 10:
return "Black and White";
default:
return "Unknown (" + value + ")";
}
}
 
public String getFocusModeDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_FOCUS_MODE)) return null;
int value = _directory.getInt(PanasonicMakernoteDirectory.TAG_PANASONIC_FOCUS_MODE);
switch (value) {
case 1:
return "Auto";
case 2:
return "Manual";
default:
return "Unknown (" + value + ")";
}
}
 
public String getImageStabilizerDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_IMAGE_STABILIZER)) return null;
int value = _directory.getInt(PanasonicMakernoteDirectory.TAG_PANASONIC_IMAGE_STABILIZER);
switch (value) {
case 2:
return "Mode 1";
case 3:
return "Off";
case 4:
return "Mode 2";
default:
return "Unknown (" + value + ")";
}
}
 
public String getPrintImageMatchingInfoDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_PRINT_IMAGE_MATCHING_INFO)) return null;
76,10 → 164,103
return "Normal";
case 2:
return "Portrait";
case 3:
return "Scenery";
case 4:
return "Sports";
case 5:
return "Night Portrait";
case 6:
return "Program";
case 7:
return "Aperture Priority";
case 8:
return "Shutter Priority";
case 9:
return "Macro";
case 11:
return "Manual";
case 13:
return "Panning";
case 18:
return "Fireworks";
case 19:
return "Party";
case 20:
return "Snow";
case 21:
return "Night Scenery";
default:
return "Unknown (" + value + ")";
}
}
 
public String getAudioDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_AUDIO)) return null;
int value = _directory.getInt(PanasonicMakernoteDirectory.TAG_PANASONIC_AUDIO);
switch (value) {
case 1:
return "Yes";
case 2:
return "No";
default:
return "Unknown (" + value + ")";
}
}
 
public String getColorEffectDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_COLOR_EFFECT)) return null;
int value = _directory.getInt(PanasonicMakernoteDirectory.TAG_PANASONIC_COLOR_EFFECT);
switch (value) {
case 1:
return "Off";
case 2:
return "Warm";
case 3:
return "Cool";
case 4:
return "Black and White";
case 5:
return "Sepia";
default:
return "Unknown (" + value + ")";
}
}
 
public String getContrastDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_CONTRAST)) return null;
int value = _directory.getInt(PanasonicMakernoteDirectory.TAG_PANASONIC_CONTRAST);
switch (value) {
case 0:
case 0x110:
return "Standard";
case 1:
case 0x100:
return "Low";
case 2:
case 0x120:
return "High";
default:
return "Unknown (" + value + ")";
}
}
 
public String getNoiseReductionDescription() throws MetadataException
{
if (!_directory.containsTag(PanasonicMakernoteDirectory.TAG_PANASONIC_NOISE_REDUCTION)) return null;
int value = _directory.getInt(PanasonicMakernoteDirectory.TAG_PANASONIC_NOISE_REDUCTION);
switch (value) {
case 0:
return "Standard";
case 1:
return "Low";
case 2:
return "High";
default:
return "Unknown (" + value + ")";
}
}
}
/contrib/metadata-extractor/trunk/src/com/drew/metadata/exif/PanasonicMakernoteDirectory.java
27,6 → 27,10
{
public static final int TAG_PANASONIC_QUALITY_MODE = 0x0001;
public static final int TAG_PANASONIC_VERSION = 0x0002;
public static final int TAG_PANASONIC_WHITE_BALANCE = 0x0003;
public static final int TAG_PANASONIC_FOCUS_MODE = 0x0007;
public static final int TAG_PANASONIC_SPOT_MODE = 0x000F;
public static final int TAG_PANASONIC_IMAGE_STABILIZER = 0x001A;
/**
* 1 = On
* 2 = Off
39,6 → 43,14
*/
public static final int TAG_PANASONIC_RECORD_MODE = 0x001F;
public static final int TAG_PANASONIC_PRINT_IMAGE_MATCHING_INFO = 0x0E00;
public static final int TAG_PANASONIC_AUDIO = 0x0020;
public static final int TAG_PANASONIC_DATA_DUMP = 0x0021;
public static final int TAG_PANASONIC_WHITE_BALANCE_BIAS = 0x0023;
public static final int TAG_PANASONIC_FLASH_BIAS = 0x0024;
public static final int TAG_PANASONIC_SERIAL_NUMBER = 0x0025;
public static final int TAG_PANASONIC_COLOR_EFFECT = 0x0028;
public static final int TAG_PANASONIC_CONTRAST = 0x002c;
public static final int TAG_PANASONIC_NOISE_REDUCTION = 0x002d;
 
protected static final HashMap tagNameMap = new HashMap();
 
45,10 → 57,22
static
{
tagNameMap.put(new Integer(TAG_PANASONIC_QUALITY_MODE), "Quality Mode");
tagNameMap.put(new Integer(TAG_PANASONIC_VERSION), "Version");
tagNameMap.put(new Integer(TAG_PANASONIC_VERSION), "Firmware Version");
tagNameMap.put(new Integer(TAG_PANASONIC_WHITE_BALANCE), "White Balance");
tagNameMap.put(new Integer(TAG_PANASONIC_FOCUS_MODE), "Focus Mode");
tagNameMap.put(new Integer(TAG_PANASONIC_SPOT_MODE), "Spot Mode");
tagNameMap.put(new Integer(TAG_PANASONIC_IMAGE_STABILIZER), "Image Stabilizer");
tagNameMap.put(new Integer(TAG_PANASONIC_MACRO_MODE), "Macro Mode");
tagNameMap.put(new Integer(TAG_PANASONIC_RECORD_MODE), "Record Mode");
tagNameMap.put(new Integer(TAG_PANASONIC_PRINT_IMAGE_MATCHING_INFO), "Print Image Matching (PIM) Info");
tagNameMap.put(new Integer(TAG_PANASONIC_AUDIO), "Audio");
tagNameMap.put(new Integer(TAG_PANASONIC_DATA_DUMP), "Data Dump");
tagNameMap.put(new Integer(TAG_PANASONIC_WHITE_BALANCE_BIAS), "White Balance Bias");
tagNameMap.put(new Integer(TAG_PANASONIC_FLASH_BIAS), "Flash Bias");
tagNameMap.put(new Integer(TAG_PANASONIC_SERIAL_NUMBER), "Serial Number");
tagNameMap.put(new Integer(TAG_PANASONIC_COLOR_EFFECT), "Color Effect");
tagNameMap.put(new Integer(TAG_PANASONIC_CONTRAST), "Contrast");
tagNameMap.put(new Integer(TAG_PANASONIC_NOISE_REDUCTION), "Noise Reduction");
}
 
public PanasonicMakernoteDirectory()
/contrib/metadata-extractor/trunk
Property changes:
Added: svn:ignore
+Build
+Releases
+javadoc
+