thomasrudin-mt/mapserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

go fmt

Browse Source
This commit is contained in:
NatureFreshMilk 2019-10-01 08:14:06 +02:00
parent 33beca15da
commit ed487651c3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mapblockrenderer/renderer.go
View File

@ -210,8 +210,8 @@ func (r *MapBlockRenderer) Render(pos1, pos2 *coords.MapBlockCoords) (*image.NRG
r32, g32, b32, a32 := c.RGBA() r32, g32, b32, a32 := c.RGBA()
r8, g8, b8, a8 := uint8(r32), uint8(g32), uint8(b32), uint8(a32) r8, g8, b8, a8 := uint8(r32), uint8(g32), uint8(b32), uint8(a32)
for Y := imgY; Y < imgY + IMG_SCALE; Y++ { for Y := imgY; Y < imgY+IMG_SCALE; Y++ {
ix := (Y * IMG_SIZE + imgX) << 2 ix := (Y*IMG_SIZE + imgX) << 2
for X := 0; X < IMG_SCALE; X++ { for X := 0; X < IMG_SCALE; X++ {
img.Pix[ix] = r8 img.Pix[ix] = r8
ix++ ix++

14
tilerenderer/renderer.go
View File

@ -3,6 +3,8 @@ package tilerenderer
import ( import (
"bytes" "bytes"
"errors" "errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"image" "image"
"image/draw" "image/draw"
"image/png" "image/png"
@ -14,8 +16,6 @@ import (
"mapserver/tiledb" "mapserver/tiledb"
"strconv" "strconv"
"time" "time"
"github.com/sirupsen/logrus"
"github.com/prometheus/client_golang/prometheus"
) )
type TileRenderer struct { type TileRenderer struct {
@ -37,7 +37,7 @@ func resizeImage(src *image.NRGBA, tgt *image.NRGBA, xoffset int, yoffset int) {
for y := 0; y < h; y++ { for y := 0; y < h; y++ {
six := y * sinc * 2 six := y * sinc * 2
tix := 4 * xoffset + (yoffset + y) * tinc tix := 4*xoffset + (yoffset+y)*tinc
for x := 0; x < w; x++ { for x := 0; x < w; x++ {
r := (uint16(src.Pix[six]) + uint16(src.Pix[six+4]) + uint16(src.Pix[six+sinc]) + uint16(src.Pix[six+sinc+4])) >> 2 r := (uint16(src.Pix[six]) + uint16(src.Pix[six+4]) + uint16(src.Pix[six+sinc]) + uint16(src.Pix[six+sinc+4])) >> 2
g := (uint16(src.Pix[six+1]) + uint16(src.Pix[six+5]) + uint16(src.Pix[six+sinc+1]) + uint16(src.Pix[six+sinc+5])) >> 2 g := (uint16(src.Pix[six+1]) + uint16(src.Pix[six+5]) + uint16(src.Pix[six+sinc+1]) + uint16(src.Pix[six+sinc+5])) >> 2
@ -47,8 +47,8 @@ func resizeImage(src *image.NRGBA, tgt *image.NRGBA, xoffset int, yoffset int) {
tgt.Pix[tix+1] = uint8(g) tgt.Pix[tix+1] = uint8(g)
tgt.Pix[tix+2] = uint8(b) tgt.Pix[tix+2] = uint8(b)
tgt.Pix[tix+3] = uint8(a) tgt.Pix[tix+3] = uint8(a)
tix+=4 tix += 4
six+=8 six += 8
} }
} }
} }
@ -68,11 +68,11 @@ func NewTileRenderer(mapblockrenderer *mapblockrenderer.MapBlockRenderer,
} }
const ( const (
IMG_SIZE = 256 IMG_SIZE = 256
SUB_IMG_SIZE = IMG_SIZE >> 1 SUB_IMG_SIZE = IMG_SIZE >> 1
) )
func (tr *TileRenderer) Render(tc *coords.TileCoords) (error) { func (tr *TileRenderer) Render(tc *coords.TileCoords) error {
//No tile in db //No tile in db
_, err := tr.renderImage(tc, 2) _, err := tr.renderImage(tc, 2)