[Bug 31557] Guild Wars 2 screenshots look bad

[wine-bugs at winehq.org]

http://bugs.winehq.org/show_bug.cgi?id=31557

--- Comment #15 from Samuel Nelson <valczir.darkvein at gmail.com> 2012-10-02 23:44:33 CDT ---
Created attachment 41936
  --> http://bugs.winehq.org/attachment.cgi?id=41936
Log of make after reverting revision 271d801

The revision doesn't cleanly revert:

valczir at nurgle:~/dev/wine/wine-git git:(master)$ git revert
271d801ea49538e196f04290fc83cd57955fed17
error: could not revert 271d801... gdiplus: Use predefined palette if an image
doesn't provide one.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

<<< 22:31.00 Tue Oct 02 2012 > Jobs: 1 >>>
valczir at nurgle:~/dev/wine/wine-git git:(master+*)$ git status
# On branch master
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#       both modified:      dlls/gdiplus/image.c
#
no changes added to commit (use "git add" and/or "git commit -a")

After that, I ran:

git checkout --theirs dlls/gdiplus/image.c
./configure --prefix ~/.wine_versions/wine-git-screenshottest

After that, make results in compile errors (full log attached).  I'm guessing
that a real merge is needed, rather than just git checkout --theirs, but I'm
not familiar with Wine's code base (at all - this is my first time actually
looking at it), and I doubt I can fix it faster than someone who is.

Doesn't mean I won't try, but I wanted to post initial results here, first. 
I'll probably give it a half-hearted whack or three tonight and/or tomorrow.

-- 
Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email
Do not reply to this email, post in Bugzilla using the
above URL to reply.
------- You are receiving this mail because: -------
You are watching all bug changes.