Subversion Repositories tpanel

Rev

Rev 365 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 365 Rev 368
Line 17... Line 17...
17 
 */
 17 
 */
18 
 
 18 
 
19 
#include <sys/types.h>
 19 
#include <sys/types.h>
20 
#include <sys/stat.h>
 20 
#include <sys/stat.h>
21 
#include <unistd.h>
 21 
#include <unistd.h>
- 
 
 22 
#ifdef __ANDROID__
- 
 
 23 
#include <android/log.h>
- 
 
 24 
#endif
22 
 
 25 
 
23 
#include <include/core/SkFont.h>
 26 
#include <include/core/SkFont.h>
24 
#include <include/core/SkFontMetrics.h>
 27 
#include <include/core/SkFontMetrics.h>
25 
#include <include/core/SkTextBlob.h>
 28 
#include <include/core/SkTextBlob.h>
26 
 
 29 
 
Line 669... Line 672...
669 
                    dImage.setImageBm(bm);
 672 
                    dImage.setImageBm(bm);
670 
                    SkImageInfo info = bm.info();
 673 
                    SkImageInfo info = bm.info();
671 
                    sr[0].bm_width = info.width();
 674 
                    sr[0].bm_width = info.width();
672 
                    sr[0].bm_height = info.height();
 675 
                    sr[0].bm_height = info.height();
673 
                    haveImage = true;
 676 
                    haveImage = true;
- 
 
 677 
                    MSG_DEBUG("Image " << sr[0].bm << " has dimension " << sr[0].bm_width << " x " << sr[0].bm_height);
674 
                }
 678 
                }
675 
                else
 679 
                else
676 
                {
 680 
                {
677 
                    MSG_WARNING("BM image " << sr[0].bm << " seems to be empty!");
 681 
                    MSG_WARNING("BM image " << sr[0].bm << " seems to be empty!");
678 
                }
 682 
                }
679 
            }
 683 
            }
680 
        }
 684 
        }
681 
 
 685 
 
- 
 
 686 
        MSG_DEBUG("haveImage: " << (haveImage ? "TRUE" : "FALSE"));
- 
 
 687 
 
682 
        if (!sr[0].mi.empty())
 688 
        if (!sr[0].mi.empty())
683 
        {
 689 
        {
684 
            MSG_DEBUG("Loading image " << sr[0].mi);
 690 
            MSG_DEBUG("Loading image " << sr[0].mi);
685 
            sk_sp<SkData> rawImage = readImage(sr[0].mi);
 691 
            sk_sp<SkData> rawImage = readImage(sr[0].mi);
686 
            SkBitmap mi;
 692 
            SkBitmap mi;