github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: DropList SetValueConvert, plugin\jpg: orientation EXIF metatag

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6238 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-08-08 13:31:11 +00:00
parent d54af3d257
commit 3d7d540706
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlLib/DropChoice.h
View file

@ -113,6 +113,7 @@ public:
PopUpTable& ListObject() { return list; }
DropList& SetDropLines(int d) { list.SetDropLines(d); return *this; }
DropList& SetValueConvert(const Convert& cv);
DropList& SetConvert(const Convert& cv);
DropList& SetDisplay(int i, const Display& d);
DropList& SetDisplay(const Display& d);

9
uppsrc/CtrlLib/DropList.cpp
View file

@ -179,14 +179,19 @@ void DropList::SetValue(const Value& v) {
Sync();
}
DropList& DropList::SetConvert(const Convert& cv)
DropList& DropList::SetValueConvert(const Convert& cv)
{
list.ColumnAt(0).SetConvert(cv);
valueconvert = &cv;
Sync();
return *this;
}
DropList& DropList::SetConvert(const Convert& cv)
{
list.ColumnAt(0).SetConvert(cv);
return SetValueConvert(cv);
}
DropList& DropList::SetDisplay(int i, const Display& d)
{
list.SetDisplay(i, 0, d);

2
uppsrc/plugin/jpg/jpgupp.cpp
View file

@ -340,6 +340,8 @@ int JPGRaster::Data::ExifDir(const char *begin, int offset, IFD_TYPE type)
// puts(NFormat("[%d]: tag %04x fmt %d, count %d, data %s",
// i, tag, fmt, count, BinHexEncode(data, data + len)));
if(type == BASE_IFD) {
if(tag == 0x112)
metadata.Add("orientation", int(data[0]));
if(tag == 0x8825) {
int offset = Exif32(data);
// puts(NFormat("GPS IFD at %08x", offset));