projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
147449b
)
Revert "[Tizen] Make do not support animated webp"
author
huiyu.eun
<huiyu.eun@samsung.com>
Mon, 29 Nov 2021 07:56:11 +0000
(16:56 +0900)
committer
huiyu.eun
<huiyu.eun@samsung.com>
Mon, 29 Nov 2021 07:56:11 +0000
(16:56 +0900)
This reverts commit
147449b6d49af583a46ccef96a9c8f206792501b
.
dali-toolkit/internal/visuals/visual-url.cpp
patch
|
blob
|
history
diff --git
a/dali-toolkit/internal/visuals/visual-url.cpp
b/dali-toolkit/internal/visuals/visual-url.cpp
index
e8700cb
..
0ad5778
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-url.cpp
+++ b/
dali-toolkit/internal/visuals/visual-url.cpp
@@
-116,13
+116,13
@@
VisualUrl::Type ResolveType(const std::string& url)
} state = SUFFIX;
char SVG[4] = {'g', 'v', 's', '.'};
char GIF[4] = {'f', 'i', 'g', '.'};
} state = SUFFIX;
char SVG[4] = {'g', 'v', 's', '.'};
char GIF[4] = {'f', 'i', 'g', '.'};
-
//
char WEBP[5] = {'p', 'b', 'e', 'w', '.'};
+ char WEBP[5] = {'p', 'b', 'e', 'w', '.'};
char JSON[5] = {'n', 'o', 's', 'j', '.'};
char TVG[4] = {'g', 'v', 't', '.'};
unsigned int svgScore = 0;
unsigned int tvgScore = 0;
unsigned int gifScore = 0;
char JSON[5] = {'n', 'o', 's', 'j', '.'};
char TVG[4] = {'g', 'v', 't', '.'};
unsigned int svgScore = 0;
unsigned int tvgScore = 0;
unsigned int gifScore = 0;
-
//
unsigned int webpScore = 0;
+ unsigned int webpScore = 0;
unsigned int jsonScore = 0;
int index = count;
while(--index >= 0)
unsigned int jsonScore = 0;
int index = count;
while(--index >= 0)
@@
-153,14
+153,14
@@
VisualUrl::Type ResolveType(const std::string& url)
return VisualUrl::GIF;
}
}
return VisualUrl::GIF;
}
}
-
//
if((offsetFromEnd < sizeof(WEBP)) && (currentChar == WEBP[offsetFromEnd]))
-
//
{
-
//
// early out if WEBP as can't be used in N patch for now
-
//
if(++webpScore == sizeof(WEBP))
-
//
{
-
//
return VisualUrl::WEBP;
-
//
}
-
//
}
+ if((offsetFromEnd < sizeof(WEBP)) && (currentChar == WEBP[offsetFromEnd]))
+ {
+ // early out if WEBP as can't be used in N patch for now
+ if(++webpScore == sizeof(WEBP))
+ {
+ return VisualUrl::WEBP;
+ }
+ }
if((offsetFromEnd < sizeof(JSON)) && (currentChar == JSON[offsetFromEnd]))
{
// early out if JSON as can't be used in N patch for now
if((offsetFromEnd < sizeof(JSON)) && (currentChar == JSON[offsetFromEnd]))
{
// early out if JSON as can't be used in N patch for now