Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef6be305 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 31b81b3c: am 6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev 

* commit '31b81b3c':
  Deep-copying sucks when all you want is a borrow
parents 19cb0685 31b81b3c

core/jni/android/graphics/MinikinUtils.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ FontStyle MinikinUtils::prepareMinikinPaint(MinikinPaint* minikinPaint, FontColl 
    FontStyle resolved = resolvedFace->fStyle;

    FontStyle resolved = resolvedFace->fStyle;





    /* Prepare minikin FontStyle */

    /* Prepare minikin FontStyle */

    std::string lang = paint->getTextLocale();

    const std::string& lang = paint->getTextLocale();

    FontLanguage minikinLang(lang.c_str(), lang.size());

    FontLanguage minikinLang(lang.c_str(), lang.size());

    FontVariant minikinVariant = (paint->getFontVariant() == VARIANT_ELEGANT) ? VARIANT_ELEGANT

    FontVariant minikinVariant = (paint->getFontVariant() == VARIANT_ELEGANT) ? VARIANT_ELEGANT

            : VARIANT_COMPACT;

            : VARIANT_COMPACT;

core/jni/android/graphics/Paint.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ public: 
        mTextLocale = textLocale;

        mTextLocale = textLocale;

    }

    }





    std::string getTextLocale() const {

    const std::string& getTextLocale() const {

        return mTextLocale;

        return mTextLocale;

    }

    }