projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add scaled icon data
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
pluginserver.C
diff --git
a/cinelerra-5.0/cinelerra/pluginserver.C
b/cinelerra-5.0/cinelerra/pluginserver.C
index 17e1b17e7afdd34b023f9be5fbb73785e071b82e..cd7ca1f4bb703f43c0689d3bcf4573f8afb5d4be 100644
(file)
--- a/
cinelerra-5.0/cinelerra/pluginserver.C
+++ b/
cinelerra-5.0/cinelerra/pluginserver.C
@@
-1229,16
+1229,17
@@
VFrame *PluginServer::get_plugin_images()
if( st.st_size == 0 ) return 0;
unsigned len = st.st_size;
int ret = 0, w = 0, h = 0;
if( st.st_size == 0 ) return 0;
unsigned len = st.st_size;
int ret = 0, w = 0, h = 0;
- u
int8_t
*bfr = 0;
+ u
nsigned char
*bfr = 0;
int fd = ::open(png_path, O_RDONLY);
if( fd < 0 ) ret = 1;
if( !ret ) {
int fd = ::open(png_path, O_RDONLY);
if( fd < 0 ) ret = 1;
if( !ret ) {
- bfr = (u
int8_t
*) ::mmap (NULL, len, PROT_READ, MAP_SHARED, fd, 0);
+ bfr = (u
nsigned char
*) ::mmap (NULL, len, PROT_READ, MAP_SHARED, fd, 0);
if( bfr == MAP_FAILED ) ret = 1;
}
VFrame *vframe = 0;
if( !ret ) {
if( bfr == MAP_FAILED ) ret = 1;
}
VFrame *vframe = 0;
if( !ret ) {
- vframe = new VFrame(bfr, st.st_size);
+ double scale = BC_WindowBase::get_resources()->icon_scale;
+ vframe = new VFramePng(bfr, st.st_size, scale, scale);
if( (w=vframe->get_w()) <= 0 || (h=vframe->get_h()) <= 0 ||
vframe->get_data() == 0 ) ret = 1;
}
if( (w=vframe->get_w()) <= 0 || (h=vframe->get_h()) <= 0 ||
vframe->get_data() == 0 ) ret = 1;
}